From cedcd7bac8f0f64bae3249d86a695bf60bfd4fea Mon Sep 17 00:00:00 2001 From: artaasadi Date: Sat, 3 Aug 2024 15:06:31 +0200 Subject: [PATCH] fix: update steampipe versions --- docker/AnalyticsWorkerDockerfile | 13 +++++++++++-- docker/ComplianceReportWorkerDockerfile | 13 +++++++++++-- docker/InsightWorkerDockerfile | 13 +++++++++++-- docker/SteampipeServiceDockerfile | 13 +++++++++++-- pkg/describe/server.go | 2 ++ 5 files changed, 46 insertions(+), 8 deletions(-) diff --git a/docker/AnalyticsWorkerDockerfile b/docker/AnalyticsWorkerDockerfile index 8bc663195..67f55cb60 100644 --- a/docker/AnalyticsWorkerDockerfile +++ b/docker/AnalyticsWorkerDockerfile @@ -4,7 +4,13 @@ FROM ${PLUGIN_REGISTRY}/steampipe-plugin-azure:0.0.1 as azure FROM ${PLUGIN_REGISTRY}/steampipe-plugin-azuread:0.0.1 as azuread FROM ${PLUGIN_REGISTRY}/steampipe-plugin-kaytu:0.0.1 as kaytu -FROM ghcr.io/turbot/steampipe:0.21.1 +FROM ubuntu:20.04 AS base +RUN apt-get update && apt-get install -y \ + curl \ + sudo \ + && rm -rf /var/lib/apt/lists/* + +RUN sudo /bin/sh -c "$(curl -fsSL https://steampipe.io/install/steampipe.sh)" COPY --from=aws /steampipe-plugin-aws.plugin /home/steampipe/.steampipe/plugins/hub.steampipe.io/plugins/turbot/aws@latest/steampipe-plugin-aws.plugin COPY --from=azure /steampipe-plugin-azure.plugin /home/steampipe/.steampipe/plugins/hub.steampipe.io/plugins/turbot/azure@latest/steampipe-plugin-azure.plugin @@ -12,7 +18,10 @@ COPY --from=azuread /steampipe-plugin-azuread.plugin /home/steampipe/.steampipe/ COPY --from=kaytu /steampipe-plugin-kaytu.plugin /home/steampipe/.steampipe/plugins/local/kaytu/kaytu.plugin USER root -RUN chown -R steampipe /home/steampipe/.steampipe/plugins/* +RUN useradd -m -s /bin/bash steampipe +RUN mkdir -p /home/steampipe/.steampipe/config +RUN chown -R steampipe:steampipe /home/steampipe +RUN chmod -R 755 /home/steampipe RUN apt update RUN apt install -y procps htop USER steampipe diff --git a/docker/ComplianceReportWorkerDockerfile b/docker/ComplianceReportWorkerDockerfile index d18ade4b2..1ef165466 100644 --- a/docker/ComplianceReportWorkerDockerfile +++ b/docker/ComplianceReportWorkerDockerfile @@ -4,7 +4,13 @@ FROM ${PLUGIN_REGISTRY}/steampipe-plugin-azure:0.0.1 as azure FROM ${PLUGIN_REGISTRY}/steampipe-plugin-azuread:0.0.1 as azuread FROM ${PLUGIN_REGISTRY}/steampipe-plugin-kaytu:0.0.1 as kaytu -FROM ghcr.io/turbot/steampipe:0.21.1 +FROM ubuntu:20.04 AS base +RUN apt-get update && apt-get install -y \ + curl \ + sudo \ + && rm -rf /var/lib/apt/lists/* + +RUN sudo /bin/sh -c "$(curl -fsSL https://steampipe.io/install/steampipe.sh)" COPY --from=aws /steampipe-plugin-aws.plugin /home/steampipe/.steampipe/plugins/hub.steampipe.io/plugins/turbot/aws@latest/steampipe-plugin-aws.plugin COPY --from=azure /steampipe-plugin-azure.plugin /home/steampipe/.steampipe/plugins/hub.steampipe.io/plugins/turbot/azure@latest/steampipe-plugin-azure.plugin @@ -12,7 +18,10 @@ COPY --from=azuread /steampipe-plugin-azuread.plugin /home/steampipe/.steampipe/ COPY --from=kaytu /steampipe-plugin-kaytu.plugin /home/steampipe/.steampipe/plugins/local/kaytu/kaytu.plugin USER root -RUN chown -R steampipe /home/steampipe/.steampipe/plugins/* +RUN useradd -m -s /bin/bash steampipe +RUN mkdir -p /home/steampipe/.steampipe/config +RUN chown -R steampipe:steampipe /home/steampipe +RUN chmod -R 755 /home/steampipe RUN apt update RUN apt install -y procps htop USER steampipe diff --git a/docker/InsightWorkerDockerfile b/docker/InsightWorkerDockerfile index 72e0942bd..5cd5e230e 100644 --- a/docker/InsightWorkerDockerfile +++ b/docker/InsightWorkerDockerfile @@ -4,7 +4,13 @@ FROM ${PLUGIN_REGISTRY}/steampipe-plugin-azure:0.0.1 as azure FROM ${PLUGIN_REGISTRY}/steampipe-plugin-azuread:0.0.1 as azuread FROM ${PLUGIN_REGISTRY}/steampipe-plugin-kaytu:0.0.1 as kaytu -FROM ghcr.io/turbot/steampipe:0.21.1 +FROM ubuntu:20.04 AS base +RUN apt-get update && apt-get install -y \ + curl \ + sudo \ + && rm -rf /var/lib/apt/lists/* + +RUN sudo /bin/sh -c "$(curl -fsSL https://steampipe.io/install/steampipe.sh)" COPY --from=aws /steampipe-plugin-aws.plugin /home/steampipe/.steampipe/plugins/hub.steampipe.io/plugins/turbot/aws@latest/steampipe-plugin-aws.plugin COPY --from=azure /steampipe-plugin-azure.plugin /home/steampipe/.steampipe/plugins/hub.steampipe.io/plugins/turbot/azure@latest/steampipe-plugin-azure.plugin @@ -12,7 +18,10 @@ COPY --from=azuread /steampipe-plugin-azuread.plugin /home/steampipe/.steampipe/ COPY --from=kaytu /steampipe-plugin-kaytu.plugin /home/steampipe/.steampipe/plugins/local/kaytu/kaytu.plugin USER root -RUN chown -R steampipe /home/steampipe/.steampipe/plugins/* +RUN useradd -m -s /bin/bash steampipe +RUN mkdir -p /home/steampipe/.steampipe/config +RUN chown -R steampipe:steampipe /home/steampipe +RUN chmod -R 755 /home/steampipe RUN apt update RUN apt install -y procps htop USER steampipe diff --git a/docker/SteampipeServiceDockerfile b/docker/SteampipeServiceDockerfile index d0b0ab826..40f1280dd 100644 --- a/docker/SteampipeServiceDockerfile +++ b/docker/SteampipeServiceDockerfile @@ -4,7 +4,13 @@ FROM ${PLUGIN_REGISTRY}/steampipe-plugin-azure:0.0.1 as azure FROM ${PLUGIN_REGISTRY}/steampipe-plugin-azuread:0.0.1 as azuread FROM ${PLUGIN_REGISTRY}/steampipe-plugin-kaytu:0.0.1 as kaytu -FROM ghcr.io/turbot/steampipe:0.21.1 +FROM ubuntu:20.04 AS base +RUN apt-get update && apt-get install -y \ + curl \ + sudo \ + && rm -rf /var/lib/apt/lists/* + +RUN sudo /bin/sh -c "$(curl -fsSL https://steampipe.io/install/steampipe.sh)" COPY --from=aws /steampipe-plugin-aws.plugin /home/steampipe/.steampipe/plugins/hub.steampipe.io/plugins/turbot/aws@latest/steampipe-plugin-aws.plugin COPY --from=azure /steampipe-plugin-azure.plugin /home/steampipe/.steampipe/plugins/hub.steampipe.io/plugins/turbot/azure@latest/steampipe-plugin-azure.plugin @@ -12,7 +18,10 @@ COPY --from=azuread /steampipe-plugin-azuread.plugin /home/steampipe/.steampipe/ COPY --from=kaytu /steampipe-plugin-kaytu.plugin /home/steampipe/.steampipe/plugins/local/kaytu/kaytu.plugin USER root -RUN chown -R steampipe /home/steampipe/.steampipe/plugins/* +RUN useradd -m -s /bin/bash steampipe +RUN mkdir -p /home/steampipe/.steampipe/config +RUN chown -R steampipe:steampipe /home/steampipe +RUN chmod -R 755 /home/steampipe RUN apt update RUN apt install -y procps htop USER steampipe diff --git a/pkg/describe/server.go b/pkg/describe/server.go index 525eddc46..027936016 100644 --- a/pkg/describe/server.go +++ b/pkg/describe/server.go @@ -796,6 +796,8 @@ func (h HttpServer) ReEvaluateComplianceJob(ctx echo.Context) error { return err } + h.Scheduler.logger.Info("re-evaluating compliance job", zap.Any("job_parameters", jobParameters)) + jobParametersJSON, err := json.Marshal(jobParameters) if err != nil { h.Scheduler.logger.Error("failed to marshal job parameters", zap.Error(err))