Fix/send inventory on secure forwarder mode (#796)

* fix: send inventory on secure forward mode * chore: bump publish action version
newrelic · Oct 29, 2021 · b17a417 · b17a417
1 parent f155646
commit b17a417
Show file tree

Hide file tree

Showing 7 changed files with 13 additions and 13 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
 }