From e085ec761b947e710eb6284fd5b5465a29b69cbf Mon Sep 17 00:00:00 2001 From: mphanias <121247041+mphanias@users.noreply.github.com> Date: Tue, 26 Mar 2024 19:20:25 +0530 Subject: [PATCH] OM180 - initial check security fix (#112) * OM180 - initial check security fix includex google/protobug 1.33.0 version, to fix - security fix - (EXPORTER) Fix Infinite loop - security fix - (EXPORTER) Fix Infinite loop * OM180 - extension fix fixed file extension as per feedback --- .github/workflows/build_release_artifacts.yaml | 12 +++++++++--- go.mod | 3 +-- go.sum | 6 ++---- 3 files changed, 12 insertions(+), 9 deletions(-) diff --git a/.github/workflows/build_release_artifacts.yaml b/.github/workflows/build_release_artifacts.yaml index e8f4b821..0745eadf 100644 --- a/.github/workflows/build_release_artifacts.yaml +++ b/.github/workflows/build_release_artifacts.yaml @@ -139,8 +139,14 @@ jobs: echo "GZipping tar files" gzip aerospike-prometheus-exporter*.tar echo "gzipped files" - ls -lrt *.gz - + ls -lrt *.tar.gz + # find in current folder i.e. pkg/target all files to move as tgz + files=$(find . -type f -name "aerospike-prome*" -printf "$(realpath -s %p) ") + for file in $files; do + echo "gzipping file === $file " + mv "$file" "${file%.tar.gz}.tgz" + done + ls -lrt *.tgz - name: Upload Release Asset env: GH_TOKEN: ${{ github.token }} @@ -159,4 +165,4 @@ jobs: echo echo "lising of files ... " echo - ls -lst pkg/target/* + ls -lst pkg/target/* \ No newline at end of file diff --git a/go.mod b/go.mod index 0e00ea88..bd21a065 100644 --- a/go.mod +++ b/go.mod @@ -27,7 +27,6 @@ require ( github.com/go-logr/stdr v1.2.2 // indirect github.com/golang/protobuf v1.5.3 // indirect github.com/grpc-ecosystem/grpc-gateway/v2 v2.16.0 // indirect - github.com/lufia/iostat v1.2.1 // indirect github.com/matttproud/golang_protobuf_extensions v1.0.4 // indirect github.com/onsi/gomega v1.27.10 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect @@ -43,6 +42,6 @@ require ( google.golang.org/genproto/googleapis/api v0.0.0-20230822172742-b8732ec3820d // indirect google.golang.org/genproto/googleapis/rpc v0.0.0-20230822172742-b8732ec3820d // indirect google.golang.org/grpc v1.59.0 // indirect - google.golang.org/protobuf v1.31.0 // indirect + google.golang.org/protobuf v1.33.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect ) diff --git a/go.sum b/go.sum index 57eb9cc3..b530e938 100644 --- a/go.sum +++ b/go.sum @@ -52,8 +52,6 @@ github.com/k0kubun/pp v3.0.1+incompatible/go.mod h1:GWse8YhT0p8pT4ir3ZgBbfZild3t github.com/k0kubun/pp/v3 v3.1.0/go.mod h1:vIrP5CF0n78pKHm2Ku6GVerpZBJvscg48WepUYEk2gw= github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE= github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY= -github.com/lufia/iostat v1.2.1 h1:tnCdZBIglgxD47RyD55kfWQcJMGzO+1QBziSQfesf2k= -github.com/lufia/iostat v1.2.1/go.mod h1:rEPNA0xXgjHQjuI5Cy05sLlS2oRcSlWHRLrvh/AQ+Pg= github.com/mattn/go-colorable v0.1.12/go.mod h1:u5H1YNBxpqRaxsYJYSkiCWKzEfiAb1Gb520KVy5xxl4= github.com/mattn/go-isatty v0.0.14/go.mod h1:7GGIvUiUoEMVVmxf/4nioHXj79iQHKdU27kJ6hsGG94= github.com/matttproud/golang_protobuf_extensions v1.0.4 h1:mmDVorXM7PCGKw94cs5zkfA9PSy5pEvNWRP0ET0TIVo= @@ -178,8 +176,8 @@ google.golang.org/protobuf v1.21.0/go.mod h1:47Nbq4nVaFHyn7ilMalzfO3qCViNmqZ2kzi google.golang.org/protobuf v1.23.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU= google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw= google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc= -google.golang.org/protobuf v1.31.0 h1:g0LDEJHgrBl9N9r17Ru3sqWhkIx2NB67okBHPwC7hs8= -google.golang.org/protobuf v1.31.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I= +google.golang.org/protobuf v1.33.0 h1:uNO2rsAINq/JlFpSdYEKIZ0uKD/R9cpdv0T+yoGwGmI= +google.golang.org/protobuf v1.33.0/go.mod h1:c6P6GXX6sHbq/GpV6MGZEdwhWPcYBgnhAHhKbcUYpos= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk= gopkg.in/fsnotify.v1 v1.4.7/go.mod h1:Tz8NjZHkW78fSQdbUxIjBTcgA1z1m8ZHf0WmKUhAMys=