From fd3007ea3fae93eb6abee63a17eba033c9ac421d Mon Sep 17 00:00:00 2001 From: Justin Kolberg Date: Thu, 5 Dec 2024 18:43:34 -0800 Subject: [PATCH 1/3] fix(ci): use correct artifact path Signed-off-by: Justin Kolberg --- .github/workflows/releases.yml | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/.github/workflows/releases.yml b/.github/workflows/releases.yml index d56a28f4df..5997e15d36 100644 --- a/.github/workflows/releases.yml +++ b/.github/workflows/releases.yml @@ -1,4 +1,4 @@ -name: 'Publish release' +name: "Publish release" run-name: > ${{ format('Publish Release for Workflow: {0}', inputs.workflow_id) }} @@ -119,7 +119,7 @@ jobs: - name: Build and push FIPS image to Open Source ECR run: | - cp artifacts/otelcol-sumo-fips-${{matrix.arch_os}} otelcol-sumo + cp artifacts/otelcol-sumo-fips-${{matrix.arch_os}}/otelcol-sumo-fips-${{matrix.arch_os}} otelcol-sumo make build-push-container-multiplatform \ BUILD_TAG=${{ needs.get-version.outputs.version }} \ PLATFORM=${{ matrix.arch_os }} \ @@ -127,7 +127,7 @@ jobs: - name: Build and push FIPS image to DockerHub run: | - cp artifacts/otelcol-sumo-fips-${{matrix.arch_os}} otelcol-sumo + cp artifacts/otelcol-sumo-fips-${{matrix.arch_os}}/otelcol-sumo-fips-${{matrix.arch_os}} otelcol-sumo make build-push-container-multiplatform \ BUILD_TAG=${{ needs.get-version.outputs.version }} \ PLATFORM=${{ matrix.arch_os }} \ @@ -136,7 +136,7 @@ jobs: - name: Build and push UBI-based FIPS image to Open Source ECR run: | - cp artifacts/otelcol-sumo-fips-${{matrix.arch_os}} otelcol-sumo + cp artifacts/otelcol-sumo-fips-${{matrix.arch_os}}/otelcol-sumo-fips-${{matrix.arch_os}} otelcol-sumo make build-push-container-ubi \ BUILD_TAG=${{ needs.get-version.outputs.version }} \ PLATFORM=${{ matrix.arch_os }} \ @@ -144,7 +144,7 @@ jobs: - name: Build and push UBI-based FIPS image to DockerHub run: | - cp artifacts/otelcol-sumo-fips-${{matrix.arch_os}} otelcol-sumo + cp artifacts/otelcol-sumo-fips-${{matrix.arch_os}}/otelcol-sumo-fips-${{matrix.arch_os}} otelcol-sumo make build-push-container-ubi \ BUILD_TAG=${{ needs.get-version.outputs.version }} \ PLATFORM=${{ matrix.arch_os }} \ @@ -153,14 +153,14 @@ jobs: - name: Build and push image to Open Source ECR run: | - cp artifacts/otelcol-sumo-${{matrix.arch_os}} otelcol-sumo + cp artifacts/otelcol-sumo-${{matrix.arch_os}}/otelcol-sumo-${{matrix.arch_os}} otelcol-sumo make build-push-container-multiplatform \ BUILD_TAG=${{ needs.get-version.outputs.version }} \ PLATFORM=${{ matrix.arch_os }} - name: Build and push image to DockerHub run: | - cp artifacts/otelcol-sumo-${{matrix.arch_os}} otelcol-sumo + cp artifacts/otelcol-sumo-${{matrix.arch_os}}/otelcol-sumo-${{matrix.arch_os}} otelcol-sumo make build-push-container-multiplatform \ BUILD_TAG=${{ needs.get-version.outputs.version }} \ PLATFORM=${{ matrix.arch_os }} \ @@ -168,7 +168,7 @@ jobs: - name: Build and push UBI-based image to Open Source ECR run: | - cp artifacts/otelcol-sumo-${{matrix.arch_os}} otelcol-sumo + cp artifacts/otelcol-sumo-${{matrix.arch_os}}/otelcol-sumo-${{matrix.arch_os}} otelcol-sumo make build-push-container-ubi \ BUILD_TAG=${{ needs.get-version.outputs.version }} \ PLATFORM=${{ matrix.arch_os }} \ @@ -176,7 +176,7 @@ jobs: - name: Build and push UBI-based image to DockerHub run: | - cp artifacts/otelcol-sumo-${{matrix.arch_os}} otelcol-sumo + cp artifacts/otelcol-sumo-${{matrix.arch_os}}/otelcol-sumo-${{matrix.arch_os}} otelcol-sumo make build-push-container-ubi \ BUILD_TAG=${{ needs.get-version.outputs.version }} \ PLATFORM=${{ matrix.arch_os }} \ From 82d04097dd4217d9ee39fe7228db127432952cd6 Mon Sep 17 00:00:00 2001 From: Justin Kolberg Date: Thu, 5 Dec 2024 18:49:39 -0800 Subject: [PATCH 2/3] fix(ci): fetch non-fips artifacts too Signed-off-by: Justin Kolberg --- .github/workflows/releases.yml | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/.github/workflows/releases.yml b/.github/workflows/releases.yml index 5997e15d36..1c94492da4 100644 --- a/.github/workflows/releases.yml +++ b/.github/workflows/releases.yml @@ -112,7 +112,15 @@ jobs: - name: Download platform otelcol-sumo artifacts from workflow uses: actions/download-artifact@v4 with: - pattern: otelcol-sumo-*-${{ matrix.arch_os }} + pattern: otelcol-sumo-${{ matrix.arch_os }} + path: artifacts/ + github-token: ${{ secrets.GITHUB_TOKEN }} + run-id: ${{ inputs.workflow_id }} + + - name: Download platform fips otelcol-sumo artifacts from workflow + uses: actions/download-artifact@v4 + with: + pattern: otelcol-sumo-fips-${{ matrix.arch_os }} path: artifacts/ github-token: ${{ secrets.GITHUB_TOKEN }} run-id: ${{ inputs.workflow_id }} From bcd6f789a0d1d0146fe38267ac2c9988e6cc9171 Mon Sep 17 00:00:00 2001 From: Jaganathan P <156800415+jagan2221@users.noreply.github.com> Date: Fri, 20 Dec 2024 15:28:42 +0530 Subject: [PATCH 3/3] Update extension.go --- pkg/extension/sumologicextension/extension.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/extension/sumologicextension/extension.go b/pkg/extension/sumologicextension/extension.go index 12211eb3c7..369e617f9b 100644 --- a/pkg/extension/sumologicextension/extension.go +++ b/pkg/extension/sumologicextension/extension.go @@ -816,7 +816,7 @@ func (se *SumologicExtension) updateMetadataWithHTTPClient(ctx context.Context, addJSONHeaders(req) - se.logger.Info("Updating collector metadata", + se.logger.Info("Updating collector metadata-1", zap.String("URL", u.String()), zap.String("body", buff.String()))