Skip to content

Commit 7aaa07f

Browse files
taylor-swansontaylor-swanson
committed
Merge branch 'main' into feature/secret-values-svc-2
2 parents abd8818 + ac66bb8 commit 7aaa07f

File tree

550 files changed

+23185
-2185
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

550 files changed

+23185
-2185
lines changed

‎.buildkite/hooks/pre-command‎

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,37 @@ GITHUB_TOKEN_VAULT_PATH=kv/ci-shared/platform-ingest/github_token
3838
EC_TOKEN_PATH=kv/ci-shared/platform-ingest/platform-ingest-ec-qa
3939
EC_DATA_PATH=secret/ci/elastic-integrations/ec_data
4040

41+
# variables required for terraform
42+
export ENVIRONMENT="ci"
43+
export REPO="${REPO_NAME}"
44+
45+
branch_name_label() {
46+
local branch="$1"
47+
48+
if [[ "${BUILDKITE_PULL_REQUEST}" != "false" ]] ; then
49+
# remove fork from branch name
50+
branch=$(echo $branch | cut -d : -f 2)
51+
fi
52+
53+
# From Jenkins
54+
# BRANCH_NAME_LOWER_CASE = "${env.BRANCH_NAME.toLowerCase().replaceAll('[^a-z0-9-]', '-')}"
55+
# to lower case and replace characters
56+
branch=$(echo "$branch" | tr '[:upper:]' '[:lower:]' | tr '_/\:. ' '-')
57+
58+
# truncate up to 63 characters limit
59+
echo $branch | head -c 63
60+
}
61+
62+
BRANCH_NAME_LOWER_CASE=$(branch_name_label "$BUILDKITE_BRANCH")
63+
export BRANCH_NAME_LOWER_CASE
64+
# This variable contains the build number https://buildkite.com/elastic/elastic-package/<number>
65+
export BUILD_ID="${BUILDKITE_BUILD_NUMBER}"
66+
# get current timestamp in milliseconds
67+
# From Jenkins
68+
# CREATED_DATE = "${new Date().getTime()}"
69+
CREATED_DATE=$(date +%s%3N)
70+
export CREATED_DATE
71+
4172
if [ -n "${ELASTIC_PACKAGE_LINKS_FILE_PATH+x}" ]; then
4273
# first upload pipeline does not have the environment variables defined in the YAML
4374
export ELASTIC_PACKAGE_LINKS_FILE_PATH=${BASE_DIR}/${ELASTIC_PACKAGE_LINKS_FILE_PATH}

‎go.mod‎

Lines changed: 47 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -4,23 +4,23 @@ go 1.21.0
44

55
require (
66
github.com/blang/semver v3.5.1+incompatible
7-
github.com/elastic/elastic-package v0.97.0
7+
github.com/elastic/elastic-package v0.98.1
88
github.com/elastic/go-licenser v0.4.1
9-
github.com/elastic/package-registry v1.23.0
9+
github.com/elastic/package-registry v1.23.1
1010
github.com/magefile/mage v1.15.0
1111
github.com/pkg/errors v0.9.1
1212
github.com/stretchr/testify v1.8.4
13-
golang.org/x/tools v0.17.0
13+
golang.org/x/tools v0.18.0
1414
gopkg.in/yaml.v2 v2.4.0
1515
)
1616

1717
require (
18-
cloud.google.com/go v0.110.10 // indirect
18+
cloud.google.com/go v0.112.0 // indirect
1919
cloud.google.com/go/compute v1.23.3 // indirect
2020
cloud.google.com/go/compute/metadata v0.2.3 // indirect
21-
cloud.google.com/go/iam v1.1.5 // indirect
22-
cloud.google.com/go/pubsub v1.33.0 // indirect
23-
cloud.google.com/go/storage v1.35.1 // indirect
21+
cloud.google.com/go/iam v1.1.6 // indirect
22+
cloud.google.com/go/pubsub v1.36.1 // indirect
23+
cloud.google.com/go/storage v1.38.0 // indirect
2424
github.com/AlecAivazis/survey/v2 v2.3.7 // indirect
2525
github.com/Azure/go-ansiterm v0.0.0-20210617225240-d185dfc1b5a1 // indirect
2626
github.com/MakeNowJust/heredoc v1.0.0 // indirect
@@ -46,24 +46,25 @@ require (
4646
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
4747
github.com/dsnet/compress v0.0.2-0.20210315054119-f66993602bf5 // indirect
4848
github.com/dustin/go-humanize v1.0.1 // indirect
49-
github.com/elastic/elastic-integration-corpus-generator-tool v0.9.0 // indirect
49+
github.com/elastic/elastic-integration-corpus-generator-tool v0.10.0 // indirect
5050
github.com/elastic/go-elasticsearch/v7 v7.17.10 // indirect
5151
github.com/elastic/go-resource v0.1.1 // indirect
5252
github.com/elastic/go-sysinfo v1.9.0 // indirect
5353
github.com/elastic/go-ucfg v0.8.6 // indirect
5454
github.com/elastic/go-windows v1.0.1 // indirect
5555
github.com/elastic/gojsonschema v1.2.1 // indirect
5656
github.com/elastic/kbncontent v0.1.3 // indirect
57-
github.com/elastic/package-spec/v3 v3.1.1 // indirect
57+
github.com/elastic/package-spec/v3 v3.1.2 // indirect
5858
github.com/emicklei/go-restful/v3 v3.11.0 // indirect
5959
github.com/evanphx/json-patch v5.7.0+incompatible // indirect
6060
github.com/evanphx/json-patch/v5 v5.9.0 // indirect
6161
github.com/exponent-io/jsonpath v0.0.0-20210407135951-1de76d718b3f // indirect
6262
github.com/fatih/color v1.16.0 // indirect
6363
github.com/felixge/httpsnoop v1.0.4 // indirect
64-
github.com/fsouza/fake-gcs-server v1.47.6 // indirect
64+
github.com/fsouza/fake-gcs-server v1.47.8 // indirect
6565
github.com/go-errors/errors v1.4.2 // indirect
66-
github.com/go-logr/logr v1.3.0 // indirect
66+
github.com/go-logr/logr v1.4.1 // indirect
67+
github.com/go-logr/stdr v1.2.2 // indirect
6768
github.com/go-ole/go-ole v1.2.6 // indirect
6869
github.com/go-openapi/errors v0.20.3 // indirect
6970
github.com/go-openapi/jsonpointer v0.19.6 // indirect
@@ -86,7 +87,7 @@ require (
8687
github.com/google/uuid v1.6.0 // indirect
8788
github.com/googleapis/enterprise-certificate-proxy v0.3.2 // indirect
8889
github.com/googleapis/gax-go/v2 v2.12.0 // indirect
89-
github.com/gorilla/handlers v1.5.1 // indirect
90+
github.com/gorilla/handlers v1.5.2 // indirect
9091
github.com/gorilla/mux v1.8.1 // indirect
9192
github.com/gorilla/websocket v1.5.0 // indirect
9293
github.com/gregjones/httpcache v0.0.0-20190611155906-901d90724c79 // indirect
@@ -102,7 +103,7 @@ require (
102103
github.com/josharian/intern v1.0.0 // indirect
103104
github.com/json-iterator/go v1.1.12 // indirect
104105
github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51 // indirect
105-
github.com/klauspost/compress v1.17.0 // indirect
106+
github.com/klauspost/compress v1.17.4 // indirect
106107
github.com/klauspost/pgzip v1.2.5 // indirect
107108
github.com/liggitt/tabwriter v0.0.0-20181228230101-89fcab3d43de // indirect
108109
github.com/lithammer/shortuuid/v3 v3.0.7 // indirect
@@ -111,7 +112,7 @@ require (
111112
github.com/mattn/go-colorable v0.1.13 // indirect
112113
github.com/mattn/go-isatty v0.0.20 // indirect
113114
github.com/mattn/go-runewidth v0.0.14 // indirect
114-
github.com/matttproud/golang_protobuf_extensions v1.0.4 // indirect
115+
github.com/matttproud/golang_protobuf_extensions/v2 v2.0.0 // indirect
115116
github.com/mgutz/ansi v0.0.0-20200706080929-d51e80ef957d // indirect
116117
github.com/mholt/archiver/v3 v3.5.1 // indirect
117118
github.com/mitchellh/copystructure v1.2.0 // indirect
@@ -133,17 +134,17 @@ require (
133134
github.com/pkg/xattr v0.4.9 // indirect
134135
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
135136
github.com/power-devops/perfstat v0.0.0-20210106213030-5aafc221ea8c // indirect
136-
github.com/prometheus/client_golang v1.17.0 // indirect
137-
github.com/prometheus/client_model v0.4.1-0.20230718164431-9a2bf3000d16 // indirect
138-
github.com/prometheus/common v0.44.0 // indirect
139-
github.com/prometheus/procfs v0.11.1 // indirect
137+
github.com/prometheus/client_golang v1.18.0 // indirect
138+
github.com/prometheus/client_model v0.5.0 // indirect
139+
github.com/prometheus/common v0.45.0 // indirect
140+
github.com/prometheus/procfs v0.12.0 // indirect
140141
github.com/rivo/uniseg v0.4.3 // indirect
141142
github.com/russross/blackfriday/v2 v2.1.0 // indirect
142143
github.com/shirou/gopsutil/v3 v3.24.1 // indirect
143144
github.com/shoenig/go-m1cpu v0.1.6 // indirect
144145
github.com/shopspring/decimal v1.3.1 // indirect
145146
github.com/spf13/afero v1.11.0 // indirect
146-
github.com/spf13/cast v1.5.1 // indirect
147+
github.com/spf13/cast v1.6.0 // indirect
147148
github.com/spf13/cobra v1.8.0 // indirect
148149
github.com/spf13/pflag v1.0.5 // indirect
149150
github.com/stretchr/objx v0.5.1 // indirect
@@ -155,43 +156,47 @@ require (
155156
github.com/xi2/xz v0.0.0-20171230120015-48954b6210f8 // indirect
156157
github.com/xlab/treeprint v1.2.0 // indirect
157158
github.com/yusufpapurcu/wmi v1.2.3 // indirect
158-
go.elastic.co/apm/module/apmgorilla/v2 v2.4.7 // indirect
159-
go.elastic.co/apm/module/apmhttp/v2 v2.4.7 // indirect
160-
go.elastic.co/apm/module/apmzap/v2 v2.4.7 // indirect
161-
go.elastic.co/apm/v2 v2.4.7 // indirect
159+
go.elastic.co/apm/module/apmgorilla/v2 v2.4.8 // indirect
160+
go.elastic.co/apm/module/apmhttp/v2 v2.4.8 // indirect
161+
go.elastic.co/apm/module/apmzap/v2 v2.4.8 // indirect
162+
go.elastic.co/apm/v2 v2.4.8 // indirect
162163
go.elastic.co/ecszap v1.0.2 // indirect
163164
go.elastic.co/fastjson v1.1.0 // indirect
164165
go.mongodb.org/mongo-driver v1.11.1 // indirect
165166
go.opencensus.io v0.24.0 // indirect
167+
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.47.0 // indirect
168+
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.47.0 // indirect
169+
go.opentelemetry.io/otel v1.22.0 // indirect
170+
go.opentelemetry.io/otel/metric v1.22.0 // indirect
171+
go.opentelemetry.io/otel/trace v1.22.0 // indirect
166172
go.starlark.net v0.0.0-20230525235612-a134d8f9ddca // indirect
167173
go.uber.org/multierr v1.11.0 // indirect
168174
go.uber.org/zap v1.26.0 // indirect
169-
golang.org/x/crypto v0.18.0 // indirect
170-
golang.org/x/mod v0.14.0 // indirect
171-
golang.org/x/net v0.20.0 // indirect
172-
golang.org/x/oauth2 v0.15.0 // indirect
175+
golang.org/x/crypto v0.19.0 // indirect
176+
golang.org/x/mod v0.15.0 // indirect
177+
golang.org/x/net v0.21.0 // indirect
178+
golang.org/x/oauth2 v0.16.0 // indirect
173179
golang.org/x/sync v0.6.0 // indirect
174-
golang.org/x/sys v0.16.0 // indirect
175-
golang.org/x/term v0.16.0 // indirect
180+
golang.org/x/sys v0.17.0 // indirect
181+
golang.org/x/term v0.17.0 // indirect
176182
golang.org/x/text v0.14.0 // indirect
177183
golang.org/x/time v0.5.0 // indirect
178-
golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2 // indirect
179-
google.golang.org/api v0.152.0 // indirect
180-
google.golang.org/appengine v1.6.7 // indirect
181-
google.golang.org/genproto v0.0.0-20231106174013-bbf56f31fb17 // indirect
182-
google.golang.org/genproto/googleapis/api v0.0.0-20231106174013-bbf56f31fb17 // indirect
183-
google.golang.org/genproto/googleapis/rpc v0.0.0-20231120223509-83a465c0220f // indirect
184-
google.golang.org/grpc v1.59.0 // indirect
185-
google.golang.org/protobuf v1.31.0 // indirect
184+
google.golang.org/api v0.162.0 // indirect
185+
google.golang.org/appengine v1.6.8 // indirect
186+
google.golang.org/genproto v0.0.0-20240125205218-1f4bbc51befe // indirect
187+
google.golang.org/genproto/googleapis/api v0.0.0-20240205150955-31a09d347014 // indirect
188+
google.golang.org/genproto/googleapis/rpc v0.0.0-20240125205218-1f4bbc51befe // indirect
189+
google.golang.org/grpc v1.61.0 // indirect
190+
google.golang.org/protobuf v1.32.0 // indirect
186191
gopkg.in/inf.v0 v0.9.1 // indirect
187192
gopkg.in/yaml.v3 v3.0.1 // indirect
188-
helm.sh/helm/v3 v3.14.0 // indirect
193+
helm.sh/helm/v3 v3.14.1 // indirect
189194
howett.net/plist v1.0.0 // indirect
190-
k8s.io/api v0.29.1 // indirect
195+
k8s.io/api v0.29.2 // indirect
191196
k8s.io/apiextensions-apiserver v0.29.0 // indirect
192-
k8s.io/apimachinery v0.29.1 // indirect
193-
k8s.io/cli-runtime v0.29.1 // indirect
194-
k8s.io/client-go v0.29.1 // indirect
197+
k8s.io/apimachinery v0.29.2 // indirect
198+
k8s.io/cli-runtime v0.29.2 // indirect
199+
k8s.io/client-go v0.29.2 // indirect
195200
k8s.io/component-base v0.29.0 // indirect
196201
k8s.io/klog/v2 v2.110.1 // indirect
197202
k8s.io/kube-openapi v0.0.0-20231010175941-2dd684a91f00 // indirect

0 commit comments

Comments
 (0)