diff --git a/.github/workflows/prerelease_linux.yml b/.github/workflows/prerelease_linux.yml index 15b964fba..081493ce1 100644 --- a/.github/workflows/prerelease_linux.yml +++ b/.github/workflows/prerelease_linux.yml @@ -211,7 +211,7 @@ jobs: username: ${{ env.DOCKER_HUB_ID }} password: ${{ env.DOCKER_HUB_PASSWORD }} - name: Publish ${{ matrix.assetsType }} to S3 action - uses: newrelic/infrastructure-publish-action@v1.0.21 + uses: newrelic/infrastructure-publish-action@v1.1.0 env: AWS_ACCESS_KEY_ID: ${{ secrets.OHAI_AWS_ACCESS_KEY_ID_STAGING }} AWS_SECRET_ACCESS_KEY: ${{ secrets.OHAI_AWS_SECRET_ACCESS_KEY_STAGING }} diff --git a/.github/workflows/prerelease_macos.yml b/.github/workflows/prerelease_macos.yml index 3aec9f4bc..529f22604 100644 --- a/.github/workflows/prerelease_macos.yml +++ b/.github/workflows/prerelease_macos.yml @@ -113,7 +113,7 @@ jobs: # username: ${{ env.DOCKER_HUB_ID }} # password: ${{ env.DOCKER_HUB_PASSWORD }} # - name: Publish ${{ matrix.assetsType }} to S3 action -# uses: newrelic/infrastructure-publish-action@v1.0.19 +# uses: newrelic/infrastructure-publish-action@v1.1.0 # env: # AWS_ACCESS_KEY_ID: ${{ secrets.OHAI_AWS_ACCESS_KEY_ID_STAGING }} # AWS_SECRET_ACCESS_KEY: ${{ secrets.OHAI_AWS_SECRET_ACCESS_KEY_STAGING }} diff --git a/.github/workflows/prerelease_staged_publish.yml b/.github/workflows/prerelease_staged_publish.yml index 39d426e14..c692b8bb8 100644 --- a/.github/workflows/prerelease_staged_publish.yml +++ b/.github/workflows/prerelease_staged_publish.yml @@ -52,7 +52,7 @@ jobs: password: ${{ env.DOCKER_HUB_PASSWORD }} - name: Publish ${{ matrix.assetsType }} to S3 action if: ${{ (github.event.inputs.assetsType == 'all' || github.event.inputs.assetsType == matrix.assetsType) && (github.event.inputs.targzOS == 'all' || github.event.inputs.targzOS == matrix.targzOS) }} - uses: newrelic/infrastructure-publish-action@v1.0.19 + uses: newrelic/infrastructure-publish-action@v1.1.0 env: AWS_ACCESS_KEY_ID: ${{ env.AWS_ACCESS_KEY_ID }} AWS_SECRET_ACCESS_KEY: ${{ env.AWS_SECRET_ACCESS_KEY }} @@ -96,7 +96,7 @@ jobs: # password: ${{ env.DOCKER_HUB_PASSWORD }} # - name: Publish ${{ matrix.assetsType }} to S3 action # if: ${{ (github.event.inputs.assetsType == 'all' || github.event.inputs.assetsType == matrix.assetsType) && (github.event.inputs.targzOS == 'all' || github.event.inputs.targzOS == matrix.targzOS) }} -# uses: newrelic/infrastructure-publish-action@v1.0.19 +# uses: newrelic/infrastructure-publish-action@v1.1.0 # env: # AWS_ACCESS_KEY_ID: ${{ env.AWS_ACCESS_KEY_ID }} # AWS_SECRET_ACCESS_KEY: ${{ env.AWS_SECRET_ACCESS_KEY }} @@ -140,7 +140,7 @@ jobs: password: ${{ env.DOCKER_HUB_PASSWORD }} - name: Publish ${{ matrix.assetsType }} to S3 action if: ${{ github.event.inputs.assetsType == 'all' || github.event.inputs.assetsType == matrix.assetsType }} - uses: newrelic/infrastructure-publish-action@v1.0.19 + uses: newrelic/infrastructure-publish-action@v1.1.0 env: AWS_ACCESS_KEY_ID: ${{ env.AWS_ACCESS_KEY_ID }} AWS_SECRET_ACCESS_KEY: ${{ env.AWS_SECRET_ACCESS_KEY }} diff --git a/.github/workflows/prerelease_windows.yml b/.github/workflows/prerelease_windows.yml index 59c5e3ebd..d527995f0 100644 --- a/.github/workflows/prerelease_windows.yml +++ b/.github/workflows/prerelease_windows.yml @@ -109,7 +109,7 @@ jobs: username: ${{ env.DOCKER_HUB_ID }} password: ${{ env.DOCKER_HUB_PASSWORD }} - name: Publish to S3 action - uses: newrelic/infrastructure-publish-action@v1.0.21 + uses: newrelic/infrastructure-publish-action@v1.1.0 env: AWS_ACCESS_KEY_ID: ${{ secrets.OHAI_AWS_ACCESS_KEY_ID_STAGING }} AWS_SECRET_ACCESS_KEY: ${{ secrets.OHAI_AWS_SECRET_ACCESS_KEY_STAGING }} diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 27cb1e213..f6022d2d2 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -42,7 +42,7 @@ jobs: username: ${{ env.DOCKER_HUB_ID }} password: ${{ env.DOCKER_HUB_PASSWORD }} - name: Publish ${{ matrix.assetsType }} to S3 action - uses: newrelic/infrastructure-publish-action@v1.0.21 + uses: newrelic/infrastructure-publish-action@v1.1.0 env: AWS_ACCESS_KEY_ID: ${{ env.AWS_ACCESS_KEY_ID }} AWS_SECRET_ACCESS_KEY: ${{ env.AWS_SECRET_ACCESS_KEY }} @@ -80,7 +80,7 @@ jobs: # # steps: # - name: Publish ${{ matrix.assetsType }} to S3 action -# uses: newrelic/infrastructure-publish-action@v1.0.19 +# uses: newrelic/infrastructure-publish-action@v1.1.0 # env: # AWS_ACCESS_KEY_ID: ${{ env.AWS_ACCESS_KEY_ID }} # AWS_SECRET_ACCESS_KEY: ${{ env.AWS_SECRET_ACCESS_KEY }} @@ -123,7 +123,7 @@ jobs: username: ${{ env.DOCKER_HUB_ID }} password: ${{ env.DOCKER_HUB_PASSWORD }} - name: Publish ${{ matrix.assetsType }} to S3 action - uses: newrelic/infrastructure-publish-action@v1.0.19 + uses: newrelic/infrastructure-publish-action@v1.1.0 env: AWS_ACCESS_KEY_ID: ${{ env.AWS_ACCESS_KEY_ID }} AWS_SECRET_ACCESS_KEY: ${{ env.AWS_SECRET_ACCESS_KEY }} diff --git a/.github/workflows/release_staged.yml b/.github/workflows/release_staged.yml index 1eb78ebea..f7c12edfd 100644 --- a/.github/workflows/release_staged.yml +++ b/.github/workflows/release_staged.yml @@ -54,7 +54,7 @@ jobs: password: ${{ env.DOCKER_HUB_PASSWORD }} - name: Publish ${{ matrix.assetsType }} to S3 action if: ${{ (github.event.inputs.assetsType == 'all' || github.event.inputs.assetsType == matrix.assetsType) && (github.event.inputs.targzOS == 'all' || github.event.inputs.targzOS == matrix.targzOS) }} - uses: newrelic/infrastructure-publish-action@v1.0.19 + uses: newrelic/infrastructure-publish-action@v1.1.0 env: AWS_ACCESS_KEY_ID: ${{ env.AWS_ACCESS_KEY_ID }} AWS_SECRET_ACCESS_KEY: ${{ env.AWS_SECRET_ACCESS_KEY }} @@ -100,7 +100,7 @@ jobs: # password: ${{ env.DOCKER_HUB_PASSWORD }} # - name: Publish ${{ matrix.assetsType }} to S3 action # if: ${{ (github.event.inputs.assetsType == 'all' || github.event.inputs.assetsType == matrix.assetsType) && (github.event.inputs.targzOS == 'all' || github.event.inputs.targzOS == matrix.targzOS) }} -# uses: newrelic/infrastructure-publish-action@v1.0.19 +# uses: newrelic/infrastructure-publish-action@v1.1.0 # env: # AWS_ACCESS_KEY_ID: ${{ env.AWS_ACCESS_KEY_ID }} # AWS_SECRET_ACCESS_KEY: ${{ env.AWS_SECRET_ACCESS_KEY }} @@ -145,7 +145,7 @@ jobs: password: ${{ env.DOCKER_HUB_PASSWORD }} - name: Publish ${{ matrix.assetsType }} to S3 action if: ${{ github.event.inputs.assetsType == 'all' || github.event.inputs.assetsType == matrix.assetsType }} - uses: newrelic/infrastructure-publish-action@v1.0.19 + uses: newrelic/infrastructure-publish-action@v1.1.0 env: AWS_ACCESS_KEY_ID: ${{ env.AWS_ACCESS_KEY_ID }} AWS_SECRET_ACCESS_KEY: ${{ env.AWS_SECRET_ACCESS_KEY }} diff --git a/internal/agent/agent.go b/internal/agent/agent.go index 3a8015355..0af3d1a85 100644 --- a/internal/agent/agent.go +++ b/internal/agent/agent.go @@ -1182,5 +1182,5 @@ func (a *Agent) gracefulShutdown() error { } func (a *Agent) shouldSendInventory() bool { - return !a.GetContext().Config().IsForwardOnly && !a.GetContext().Config().IsSecureForwardOnly + return !a.GetContext().Config().IsForwardOnly }