diff --git a/.github/workflows/post-dependabot.yml b/.github/workflows/post-dependabot.yml index dcd5e33b7..49aafa810 100644 --- a/.github/workflows/post-dependabot.yml +++ b/.github/workflows/post-dependabot.yml @@ -22,36 +22,22 @@ jobs: with: go-version-file: .go-version - - name: run go mod tidy in testing/ - run: cd testing; go mod tidy - - - name: check for modified testing/go.mod or testing/go.sum - id: testing-mod-check - run: echo "modified=$(if git diff-index --quiet HEAD -- testing/go.mod testing/go.sum; then echo "false"; else echo "true"; fi)" >> $GITHUB_OUTPUT - - - name: commit testing/go.mod and testing/go.sum files - if: steps.testing-mod-check.outputs.modified == 'true' - run: | - git config --global user.name 'dependabot[bot]' - git config --global user.email 'dependabot[bot]@users.noreply.github.com' - git add testing/go.mod testing/go.sum - git remote set-url origin https://x-access-token:${{ secrets.GITHUB_TOKEN }}@github.com/${{ github.repository }} - git commit -m "Update testing/go.mod and testing/go.sum files" - git push - - name: update NOTICE.txt run: make notice - - name: check for modified NOTICE.txt - id: notice-check - run: echo "modified=$(if git diff-index --quiet HEAD -- NOTICE.txt; then echo "false"; else echo "true"; fi)" >> $GITHUB_OUTPUT + - name: run go mod tidy in testing/ + run: cd testing; go mod tidy + + - name: check for modified files + id: check-files + run: echo "modified=$(if git diff-index --quiet HEAD -- NOTICE.txt testing/go.mod testing/go.sum; then echo "false"; else echo "true"; fi)" >> $GITHUB_OUTPUT - - name: commit NOTICE.txt - if: steps.notice-check.outputs.modified == 'true' + - name: commit modified files + if: steps.check-files.outputs.modified == 'true' run: | git config --global user.name 'dependabot[bot]' git config --global user.email 'dependabot[bot]@users.noreply.github.com' - git add NOTICE.txt + git add NOTICE.txt testing/go.mod testing/go.sum git remote set-url origin https://x-access-token:${{ secrets.GITHUB_TOKEN }}@github.com/${{ github.repository }} - git commit -m "Update NOTICE.txt" + git commit -m "Post dependabot file modifications" git push diff --git a/NOTICE.txt b/NOTICE.txt index 4408560db..07b57ab2f 100644 --- a/NOTICE.txt +++ b/NOTICE.txt @@ -882,11 +882,11 @@ Contents of probable licence file $GOMODCACHE/github.com/elastic/elastic-agent-s -------------------------------------------------------------------------------- Dependency : github.com/elastic/go-elasticsearch/v8 -Version: v8.10.1 +Version: v8.12.1 Licence type (autodetected): Apache-2.0 -------------------------------------------------------------------------------- -Contents of probable licence file $GOMODCACHE/github.com/elastic/go-elasticsearch/v8@v8.10.1/LICENSE: +Contents of probable licence file $GOMODCACHE/github.com/elastic/go-elasticsearch/v8@v8.12.1/LICENSE: Apache License Version 2.0, January 2004 diff --git a/go.mod b/go.mod index 26945585b..e4b406781 100644 --- a/go.mod +++ b/go.mod @@ -8,7 +8,7 @@ require ( github.com/elastic/elastic-agent-client/v7 v7.8.0 github.com/elastic/elastic-agent-libs v0.7.4 github.com/elastic/elastic-agent-system-metrics v0.9.2 - github.com/elastic/go-elasticsearch/v8 v8.10.1 + github.com/elastic/go-elasticsearch/v8 v8.12.1 github.com/elastic/go-ucfg v0.8.6 github.com/fxamacker/cbor/v2 v2.5.0 github.com/go-chi/chi/v5 v5.0.10 diff --git a/go.sum b/go.sum index 316d501bf..eb4a7baf9 100644 --- a/go.sum +++ b/go.sum @@ -40,11 +40,10 @@ github.com/elastic/elastic-agent-libs v0.7.4 h1:/cmwOLwNAyJDNeR6sFIbHCDHDLPX2zAb github.com/elastic/elastic-agent-libs v0.7.4/go.mod h1:pGMj5myawdqu+xE+WKvM5FQzKQ/MonikkWOzoFTJxaU= github.com/elastic/elastic-agent-system-metrics v0.9.2 h1:/tvTKOt55EerU0WwGFoDhBlyWLgxyv7d8xCbny0bciw= github.com/elastic/elastic-agent-system-metrics v0.9.2/go.mod h1:VfJnKw4Jqrd9ddljXCwaGKJgN+7ADyyGk089NaXVsf0= -github.com/elastic/elastic-transport-go/v8 v8.3.0/go.mod h1:87Tcz8IVNe6rVSLdBux1o/PEItLtyabHU3naC7IoqKI= github.com/elastic/elastic-transport-go/v8 v8.4.0 h1:EKYiH8CHd33BmMna2Bos1rDNMM89+hdgcymI+KzJCGE= github.com/elastic/elastic-transport-go/v8 v8.4.0/go.mod h1:YLHer5cj0csTzNFXoNQ8qhtGY1GTvSqPnKWKaqQE3Hk= -github.com/elastic/go-elasticsearch/v8 v8.10.1 h1:JJ3i2DimYTsJcUoEGbg6tNB0eehTNdid9c5kTR1TGuI= -github.com/elastic/go-elasticsearch/v8 v8.10.1/go.mod h1:GU1BJHO7WeamP7UhuElYwzzHtvf9SDmeVpSSy9+o6Qg= +github.com/elastic/go-elasticsearch/v8 v8.12.1 h1:QcuFK5LaZS0pSIj/eAEsxmJWmMo7tUs1aVBbzdIgtnE= +github.com/elastic/go-elasticsearch/v8 v8.12.1/go.mod h1:wSzJYrrKPZQ8qPuqAqc6KMR4HrBfHnZORvyL+FMFqq0= github.com/elastic/go-structform v0.0.10 h1:oy08o/Ih2hHTkNcRY/1HhaYvIp5z6t8si8gnCJPDo1w= github.com/elastic/go-structform v0.0.10/go.mod h1:CZWf9aIRYY5SuKSmOhtXScE5uQiLZNqAFnwKR4OrIM4= github.com/elastic/go-sysinfo v1.13.1 h1:U5Jlx6c/rLkR72O8wXXXo1abnGlWGJU/wbzNJ2AfQa4=