Skip to content

Commit

Permalink
Merge branch 'main' into 10463-create-agentless-agent
Browse files Browse the repository at this point in the history
  • Loading branch information
gurevichdmitry authored Oct 10, 2024
2 parents 5180346 + beb0270 commit f154934
Show file tree
Hide file tree
Showing 25 changed files with 143 additions and 206 deletions.
6 changes: 0 additions & 6 deletions .github/workflows/test-environment.yml
Original file line number Diff line number Diff line change
Expand Up @@ -183,12 +183,6 @@ jobs:
run: |
# Extract the stack version
stack_version="${{ inputs.elk-stack-version }}"
is_serverless_mode="${{ inputs.serverless_mode }}"
if [[ $is_serverless_mode == "true" ]]; then
# Stack version is not relevant for serverless deployments
# Therefore, we set it to the latest snapshot version
stack_version="${{ env.ELK_VERSION }}"
fi
echo "TF_VAR_stack_version=$stack_version" >> $GITHUB_ENV
echo "STACK_VERSION=$stack_version" >> $GITHUB_ENV
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/updatecli.yml
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ jobs:
- name: Init Hermit
run: ./bin/hermit env -r >> $GITHUB_ENV
- name: Install Updatecli in the runner
uses: updatecli/updatecli-action@6b8881a17fc8038e884ec94ff72a49e8e8a4069f # v0.76.1
uses: updatecli/updatecli-action@92a13b95c2cd9f1c6742c965509203c6a5635ed7 # v0.76.1
- name: Run Updatecli in Apply mode
run: updatecli apply --config .ci/updatecli/updatecli.d/update-${{ matrix.pipeline-name }}.yml --values .ci/updatecli/values.yml
env:
Expand Down Expand Up @@ -84,7 +84,7 @@ jobs:
echo "GIT_BRANCH=$branchName" >> $GITHUB_ENV
- name: Install Updatecli in the runner
uses: updatecli/updatecli-action@6b8881a17fc8038e884ec94ff72a49e8e8a4069f # v0.76.1
uses: updatecli/updatecli-action@92a13b95c2cd9f1c6742c965509203c6a5635ed7 # v0.76.1
- name: Run Updatecli in Apply mode
run: updatecli apply --config .ci/updatecli/updatecli.d/update-${{ matrix.pipeline-name }}.yml --values .ci/updatecli/values.yml
env:
Expand Down
2 changes: 1 addition & 1 deletion .go-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
1.23.1
1.23.2
9 changes: 5 additions & 4 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ exclude: (bin/(activate-)?hermit)|(scripts/make/gimme/.*)
repos:
## General
- repo: https://github.com/pre-commit/pre-commit-hooks
rev: v4.6.0
rev: v5.0.0
hooks:
- id: check-merge-conflict
- id: check-added-large-files
Expand Down Expand Up @@ -42,7 +42,7 @@ repos:
files: ^(.ci/scripts|.github/actions|tests)/

- repo: https://github.com/pycqa/pylint
rev: v3.3.0
rev: v3.3.1
hooks:
- id: pylint
args: [
Expand Down Expand Up @@ -77,7 +77,7 @@ repos:
files: deploy/cloudformation/.*yml

- repo: https://github.com/aws-cloudformation/cfn-lint
rev: v1.14.2
rev: v1.16.0
hooks:
- id: cfn-python-lint
files: deploy/cloudformation/.*.yml
Expand Down Expand Up @@ -170,14 +170,15 @@ repos:
files: (\.rego)$

- repo: https://github.com/igorshubovych/markdownlint-cli
rev: v0.41.0
rev: v0.42.0
hooks:
- id: markdownlint
args: [ '--disable',
MD013, # Line length can be ignored for now
MD033, # Allow inline HTML
MD046, # Allow code blocks to be fenced with backticks
MD041, # Allow multiple top level headers
MD058, # Allow tables without blank lines around
'--' ]
# TODO: Apply makrdownlint in other files
files: security-policies/.*\.(md|markdown)$
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
2 changes: 1 addition & 1 deletion bin/bq
2 changes: 1 addition & 1 deletion bin/docker-credential-gcloud
2 changes: 1 addition & 1 deletion bin/gcloud
2 changes: 1 addition & 1 deletion bin/gh
2 changes: 1 addition & 1 deletion bin/git-credential-gcloud.sh
2 changes: 1 addition & 1 deletion bin/go
2 changes: 1 addition & 1 deletion bin/gofmt
2 changes: 1 addition & 1 deletion bin/gsutil
2 changes: 1 addition & 1 deletion bin/just
2 changes: 1 addition & 1 deletion bin/opa
2 changes: 1 addition & 1 deletion bin/pre-commit
2 changes: 1 addition & 1 deletion docs/version.asciidoc
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// doc-branch can be: master, 8.1, 8.2, etc.
:doc-branch: master
:go-version: 1.23.1
:go-version: 1.23.2
:python: 3.7
:docker: 1.12
:docker-compose: 1.11
82 changes: 38 additions & 44 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -21,33 +21,33 @@ require (
github.com/aquasecurity/trivy v0.55.2
github.com/aquasecurity/trivy-db v0.0.0-20240910133327-7e0f4d2ed4c1
github.com/aws/aws-sdk-go-v2 v1.31.0
github.com/aws/aws-sdk-go-v2/config v1.27.36
github.com/aws/aws-sdk-go-v2/credentials v1.17.34
github.com/aws/aws-sdk-go-v2/config v1.27.39
github.com/aws/aws-sdk-go-v2/credentials v1.17.37
github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.16.14
github.com/aws/aws-sdk-go-v2/service/accessanalyzer v1.33.0
github.com/aws/aws-sdk-go-v2/service/autoscaling v1.44.0
github.com/aws/aws-sdk-go-v2/service/cloudformation v1.54.0
github.com/aws/aws-sdk-go-v2/service/cloudtrail v1.43.0
github.com/aws/aws-sdk-go-v2/service/cloudwatch v1.41.0
github.com/aws/aws-sdk-go-v2/service/cloudwatchlogs v1.40.0
github.com/aws/aws-sdk-go-v2/service/configservice v1.49.0
github.com/aws/aws-sdk-go-v2/service/ec2 v1.178.0
github.com/aws/aws-sdk-go-v2/service/ecr v1.35.0
github.com/aws/aws-sdk-go-v2/service/elasticloadbalancing v1.27.0
github.com/aws/aws-sdk-go-v2/service/iam v1.36.0
github.com/aws/aws-sdk-go-v2/service/kms v1.36.0
github.com/aws/aws-sdk-go-v2/service/lambda v1.61.0
github.com/aws/aws-sdk-go-v2/service/organizations v1.32.0
github.com/aws/aws-sdk-go-v2/service/rds v1.84.0
github.com/aws/aws-sdk-go-v2/service/s3 v1.63.0
github.com/aws/aws-sdk-go-v2/service/s3control v1.48.0
github.com/aws/aws-sdk-go-v2/service/securityhub v1.53.0
github.com/aws/aws-sdk-go-v2/service/sns v1.32.0
github.com/aws/aws-sdk-go-v2/service/sts v1.31.0
github.com/aws/aws-sdk-go-v2/service/accessanalyzer v1.33.3
github.com/aws/aws-sdk-go-v2/service/autoscaling v1.44.3
github.com/aws/aws-sdk-go-v2/service/cloudformation v1.54.3
github.com/aws/aws-sdk-go-v2/service/cloudtrail v1.43.3
github.com/aws/aws-sdk-go-v2/service/cloudwatch v1.41.3
github.com/aws/aws-sdk-go-v2/service/cloudwatchlogs v1.40.3
github.com/aws/aws-sdk-go-v2/service/configservice v1.49.3
github.com/aws/aws-sdk-go-v2/service/ec2 v1.179.2
github.com/aws/aws-sdk-go-v2/service/ecr v1.35.3
github.com/aws/aws-sdk-go-v2/service/elasticloadbalancing v1.27.3
github.com/aws/aws-sdk-go-v2/service/iam v1.36.3
github.com/aws/aws-sdk-go-v2/service/kms v1.36.3
github.com/aws/aws-sdk-go-v2/service/lambda v1.62.1
github.com/aws/aws-sdk-go-v2/service/organizations v1.33.1
github.com/aws/aws-sdk-go-v2/service/rds v1.85.2
github.com/aws/aws-sdk-go-v2/service/s3 v1.63.3
github.com/aws/aws-sdk-go-v2/service/s3control v1.48.3
github.com/aws/aws-sdk-go-v2/service/securityhub v1.53.3
github.com/aws/aws-sdk-go-v2/service/sns v1.32.3
github.com/aws/aws-sdk-go-v2/service/sts v1.31.3
github.com/aws/smithy-go v1.21.0
github.com/dgraph-io/ristretto v0.1.1
github.com/dgraph-io/ristretto v1.0.0
github.com/djherbis/times v1.6.0
github.com/elastic/beats/v7 v7.0.0-alpha2.0.20240921065707-7720c900f893
github.com/elastic/beats/v7 v7.0.0-alpha2.0.20241005225259-775d26d94a5a
github.com/elastic/e2e-testing v1.2.3
github.com/elastic/elastic-agent-autodiscover v0.8.2
github.com/elastic/elastic-agent-client/v7 v7.16.0
Expand All @@ -71,7 +71,7 @@ require (
github.com/spf13/viper v1.19.0
github.com/stretchr/testify v1.9.0
github.com/tsg/go-daemon v0.0.0-20200207173439-e704b93fd89b
go.elastic.co/go-licence-detector v0.6.1
go.elastic.co/go-licence-detector v0.7.0
go.uber.org/goleak v1.3.0
go.uber.org/zap v1.27.0
go.uber.org/zap/exp v0.1.1-0.20240530135403-273f9ea8c887
Expand Down Expand Up @@ -108,6 +108,7 @@ require (
github.com/containerd/platforms v0.2.1 // indirect
github.com/csaf-poc/csaf_distribution/v3 v3.0.0 // indirect
github.com/cyberphone/json-canonicalization v0.0.0-20231011164504-785e29786b46 // indirect
github.com/dgraph-io/badger/v4 v4.2.1-0.20240828131336-2725dc8ed5c2 // indirect
github.com/digitorus/pkcs7 v0.0.0-20230818184609-3a137a874352 // indirect
github.com/digitorus/timestamp v0.0.0-20231217203849-220c5c2851b7 // indirect
github.com/distribution/reference v0.6.0 // indirect
Expand All @@ -116,7 +117,6 @@ require (
github.com/fxamacker/cbor/v2 v2.7.0 // indirect
github.com/go-chi/chi v4.1.2+incompatible // indirect
github.com/go-git/go-git/v5 v5.12.0 // indirect
github.com/gobuffalo/here v0.6.7 // indirect
github.com/gofrs/uuid/v5 v5.2.0 // indirect
github.com/google/certificate-transparency-go v1.1.8 // indirect
github.com/google/gnostic-models v0.6.9-0.20230804172637-c7be7c783f49 // indirect
Expand Down Expand Up @@ -155,8 +155,8 @@ require (
github.com/xdg-go/scram v1.1.2 // indirect
github.com/xdg-go/stringprep v1.0.4 // indirect
github.com/yuin/gopher-lua v1.1.1 // indirect
go.opentelemetry.io/collector/consumer v0.107.0 // indirect
go.opentelemetry.io/collector/pdata v1.13.0 // indirect
go.opentelemetry.io/collector/consumer v0.109.0 // indirect
go.opentelemetry.io/collector/pdata v1.15.0 // indirect
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.54.0 // indirect
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.54.0 // indirect
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.29.0 // indirect
Expand Down Expand Up @@ -234,20 +234,19 @@ require (
github.com/aws/aws-sdk-go-v2/internal/ini v1.8.1 // indirect
github.com/aws/aws-sdk-go-v2/internal/v4a v1.3.18 // indirect
github.com/aws/aws-sdk-go-v2/service/ebs v1.23.10 // indirect
github.com/aws/aws-sdk-go-v2/service/elasticloadbalancingv2 v1.38.0
github.com/aws/aws-sdk-go-v2/service/elasticloadbalancingv2 v1.38.3
github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.11.5 // indirect
github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.3.20 // indirect
github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.11.20 // indirect
github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.17.18 // indirect
github.com/aws/aws-sdk-go-v2/service/sso v1.23.0 // indirect
github.com/aws/aws-sdk-go-v2/service/ssooidc v1.27.0 // indirect
github.com/aws/aws-sdk-go-v2/service/sso v1.23.3 // indirect
github.com/aws/aws-sdk-go-v2/service/ssooidc v1.27.3 // indirect
github.com/beorn7/perks v1.0.1 // indirect
github.com/bgentry/go-netrc v0.0.0-20140422174119-9fd32a8b3d3d // indirect
github.com/bmatcuk/doublestar/v4 v4.6.1 // indirect
github.com/briandowns/spinner v1.23.0 // indirect
github.com/bytecodealliance/wasmtime-go/v3 v3.0.2 // indirect
github.com/cenkalti/backoff/v4 v4.3.0 // indirect
github.com/cespare/xxhash v1.1.0 // indirect
github.com/cespare/xxhash/v2 v2.3.0 // indirect
github.com/chai2010/gettext-go v1.0.2 // indirect
github.com/cheggaaa/pb/v3 v3.1.5 // indirect
Expand All @@ -263,14 +262,13 @@ require (
github.com/containerd/typeurl/v2 v2.1.1 // indirect
github.com/cyphar/filepath-securejoin v0.3.2 // indirect
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
github.com/dgraph-io/badger/v3 v3.2103.5 // indirect
github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f // indirect
github.com/dimchansky/utfbom v1.1.1 // indirect
github.com/dlclark/regexp2 v1.10.0 // indirect
github.com/dnephin/pflag v1.0.7 // indirect
github.com/docker/cli v27.1.1+incompatible // indirect
github.com/docker/distribution v2.8.3+incompatible // indirect
github.com/docker/docker v27.1.1+incompatible // indirect
github.com/docker/docker v27.3.1+incompatible // indirect
github.com/docker/docker-credential-helpers v0.8.2 // indirect
github.com/docker/go-connections v0.5.0 // indirect
github.com/docker/go-events v0.0.0-20190806004212-e31b211e4f1c // indirect
Expand All @@ -287,10 +285,9 @@ require (
github.com/elastic/go-lumber v0.1.2-0.20220819171948-335fde24ea0f // indirect
github.com/elastic/go-seccomp-bpf v1.4.0 // indirect
github.com/elastic/go-structform v0.0.10 // indirect
github.com/elastic/go-sysinfo v1.14.1 // indirect
github.com/elastic/go-windows v1.0.1 // indirect
github.com/elastic/go-sysinfo v1.14.2 // indirect
github.com/elastic/go-windows v1.0.2 // indirect
github.com/elastic/gosigar v0.14.3 // indirect
github.com/elazarl/goproxy/ext v0.0.0-20230731152917-f99041a5c027 // indirect
github.com/elliotchance/orderedmap v1.6.0 // indirect
github.com/emicklei/go-restful/v3 v3.11.0 // indirect
github.com/emirpasic/gods v1.18.1 // indirect
Expand Down Expand Up @@ -325,7 +322,6 @@ require (
github.com/gogo/protobuf v1.3.2 // indirect
github.com/golang-jwt/jwt/v4 v4.5.0 // indirect
github.com/golang-jwt/jwt/v5 v5.2.1 // indirect
github.com/golang/glog v1.2.2 // indirect
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
github.com/golang/protobuf v1.5.4 // indirect
github.com/golang/snappy v0.0.4 // indirect
Expand All @@ -347,7 +343,7 @@ require (
github.com/gosuri/uitable v0.0.4 // indirect
github.com/gregjones/httpcache v0.0.0-20190611155906-901d90724c79 // indirect
github.com/h2non/filetype v1.1.1 // indirect
github.com/hashicorp/cronexpr v1.1.0 // indirect
github.com/hashicorp/cronexpr v1.1.2 // indirect
github.com/hashicorp/errwrap v1.1.0 // indirect
github.com/hashicorp/go-cleanhttp v0.5.2 // indirect
github.com/hashicorp/go-getter v1.7.5 // indirect
Expand All @@ -358,7 +354,7 @@ require (
github.com/hashicorp/golang-lru/v2 v2.0.7 // indirect
github.com/hashicorp/hcl v1.0.1-vault-5 // indirect
github.com/hashicorp/hcl/v2 v2.21.0 // indirect
github.com/hashicorp/nomad/api v0.0.0-20201203164818-6318a8ac7bf8 // indirect
github.com/hashicorp/nomad/api v0.0.0-20240717122358-3d93bd3778f3 // indirect
github.com/imdario/mergo v0.3.16 // indirect
github.com/in-toto/in-toto-golang v0.9.0 // indirect
github.com/inconshreveable/mousetrap v1.1.0 // indirect
Expand All @@ -376,7 +372,6 @@ require (
github.com/josephspurrier/goversioninfo v1.4.0 // indirect
github.com/josharian/intern v1.0.0 // indirect
github.com/json-iterator/go v1.1.12 // indirect
github.com/karrick/godirwalk v1.17.0 // indirect
github.com/kevinburke/ssh_config v1.2.0 // indirect
github.com/klauspost/compress v1.17.9 // indirect
github.com/knqyf263/go-apk-version v0.0.0-20200609155635-041fdbb8563f // indirect
Expand All @@ -396,7 +391,6 @@ require (
github.com/lunixbochs/struc v0.0.0-20200707160740-784aaebc1d40 // indirect
github.com/magiconair/properties v1.8.7 // indirect
github.com/mailru/easyjson v0.7.7 // indirect
github.com/markbates/pkger v0.17.1 // indirect
github.com/masahiro331/go-disk v0.0.0-20240625071113-56c933208fee // indirect
github.com/masahiro331/go-ebs-file v0.0.0-20240112135404-d5fbb1d46323 // indirect
github.com/masahiro331/go-ext4-filesystem v0.0.0-20240620024024-ca14e6327bbd // indirect
Expand All @@ -406,7 +400,7 @@ require (
github.com/mattn/go-isatty v0.0.20 // indirect
github.com/mattn/go-runewidth v0.0.16 // indirect
github.com/microsoft/go-rustaudit v0.0.0-20220808201409-204dfee52032 // indirect
github.com/miekg/dns v1.1.57 // indirect
github.com/miekg/dns v1.1.61 // indirect
github.com/mitchellh/copystructure v1.2.0 // indirect
github.com/mitchellh/go-homedir v1.1.0 // indirect
github.com/mitchellh/go-testing-interface v1.14.1 // indirect
Expand Down Expand Up @@ -511,7 +505,7 @@ require (
google.golang.org/genproto v0.0.0-20240903143218-8af14fe29dc1 // indirect
google.golang.org/genproto/googleapis/api v0.0.0-20240903143218-8af14fe29dc1 // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20240903143218-8af14fe29dc1 // indirect
google.golang.org/grpc v1.67.0
google.golang.org/grpc v1.67.1
google.golang.org/protobuf v1.34.2
gopkg.in/cheggaaa/pb.v1 v1.0.28 // indirect
gopkg.in/inf.v0 v0.9.1 // indirect
Expand Down
Loading

0 comments on commit f154934

Please sign in to comment.