Skip to content

Commit

Permalink
Merge pull request #1262 from flanksource/fix-transformed-label-issue
Browse files Browse the repository at this point in the history
fix: label handling for transformed checks
  • Loading branch information
moshloop authored Sep 21, 2023
2 parents ab926c3 + 9813a8b commit b43b840
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 6 deletions.
5 changes: 2 additions & 3 deletions build/full/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -76,9 +76,6 @@ RUN curl -L https://github.com/multiprocessio/dsq/releases/download/v0.23.0/dsq-
mv dsq /usr/local/bin/dsq && \
rm dsq.zip

# install CA certificates
COPY --from=builder /app/.bin/canary-checker /app

# Install alexellis/arkade as root
RUN curl -sLS https://get.arkade.dev | sh

Expand Down Expand Up @@ -107,5 +104,7 @@ RUN curl -sL -O https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/googl
ln -sf /app/google-cloud-sdk/bin/gcloud ${HOME}/bin/gcloud && \
rm google-cloud-cli-441.0.0-linux-x86_64.tar.gz

COPY --from=builder /app/.bin/canary-checker /app

RUN /app/canary-checker go-offline
ENTRYPOINT ["/app/canary-checker"]
4 changes: 1 addition & 3 deletions checks/common.go
Original file line number Diff line number Diff line change
Expand Up @@ -91,9 +91,7 @@ func transform(ctx *context.Context, in *pkg.CheckResult) ([]*pkg.CheckResult, e
if r.Canary.Labels == nil {
r.Canary.Labels = make(map[string]string)
}
for k, v := range t.Labels {
r.Canary.Labels[k] = v
}

// We use this label to set the transformed column to true
// This label is used and then removed in pkg.FromV1 function
r.Canary.Labels["transformed"] = "true" //nolint:goconst
Expand Down

0 comments on commit b43b840

Please sign in to comment.