Skip to content

Commit d964ab5

Browse files
jsorianojsoriano
committed
Merge remote-tracking branch 'origin/main' into profile-resources
2 parents a17fcdd + 599941d commit d964ab5

Some content is hidden

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

58 files changed

+1467
-164
lines changed

‎.buildkite/pipeline.yml

+28
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
steps:
2+
- label: ":go: Run check-static"
3+
command: "make check-static"
4+
agents:
5+
image: "golang:1.19.5"
6+
cpu: "8"
7+
memory: "4G"
8+
9+
- label: ":go: Run unit tests"
10+
command: "make test-go-ci"
11+
artifact_paths:
12+
- "build/test-results/*.xml"
13+
- "build/test-coverage/*.xml"
14+
agents:
15+
image: "golang:1.19.5"
16+
cpu: "8"
17+
memory: "4G"
18+
19+
- wait: ~
20+
continue_on_failure: true
21+
22+
- label: "Junit annotate"
23+
plugins:
24+
- junit-annotate#v2.4.1:
25+
artifacts: "build/test-results/*.xml"
26+
agents:
27+
provider: "gcp"
28+

‎.buildkite/pull-requests.json

+20
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
{
2+
"jobs": [
3+
{
4+
"enabled": true,
5+
"pipelineSlug": "elastic-package",
6+
"allow_org_users": true,
7+
"allowed_repo_permissions": ["admin", "write"],
8+
"allowed_list": ["dependabot[bot]", "mergify[bot]"],
9+
"set_commit_status": true,
10+
"build_on_commit": true,
11+
"build_on_comment": true,
12+
"trigger_comment_regex": "^(?:(?:buildkite\\W+)?(?:build|test)\\W+(?:this|it))",
13+
"always_trigger_comment_regex": "^(?:(?:buildkite\\W+)?(?:build|test)\\W+(?:this|it))",
14+
"skip_ci_labels": [ ],
15+
"skip_target_branches": [ ],
16+
"skip_ci_on_only_changed": [ ],
17+
"always_require_ci_on_changed": [ ]
18+
}
19+
]
20+
}

‎.ci/Jenkinsfile

+2-2
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@ pipeline {
1515
PIPELINE_LOG_LEVEL='INFO'
1616
AWS_ACCOUNT_SECRET = 'secret/observability-team/ci/elastic-observability-aws-account-auth'
1717
HOME = "${env.WORKSPACE}"
18-
KIND_VERSION = 'v0.14.0'
19-
K8S_VERSION = 'v1.25.0'
18+
KIND_VERSION = 'v0.17.0'
19+
K8S_VERSION = 'v1.26.0'
2020
JOB_GCS_BUCKET = 'fleet-ci-temp'
2121
JOB_GCS_BUCKET_INTERNAL = 'fleet-ci-temp-internal'
2222
JOB_GCS_CREDENTIALS = 'fleet-ci-gcs-plugin'

‎.github/workflows/add-issues-to-ingest-board.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ jobs:
3636
if: github.event.label.name == env.ECOSYSTEM_LABEL
3737
with:
3838
query: |
39-
mutation updateIngestArea($item_id: ID!, $project_id: ID!, $areaField_id: ID!, $area_id: String) {
39+
mutation updateIngestArea($item_id: ID!, $project_id: ID!, $area_field_id: ID!, $area_id: String) {
4040
updateProjectV2ItemFieldValue(
4141
input: { itemId: $item_id, projectId: $project_id, fieldId: $area_field_id, value: { singleSelectOptionId: $area_id } }) {
4242
clientMutationId

‎.github/workflows/add-to-ecosystem-project.yml

-39
This file was deleted.

‎.go-version

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
1.19.1
1+
1.19.5

‎cmd/stack.go

+2-5
Original file line numberDiff line numberDiff line change
@@ -179,20 +179,17 @@ func setupStackCommand() *cobraext.Command {
179179
if err != nil {
180180
return cobraext.FlagParsingError(err, cobraext.ShellInitShellFlagName)
181181
}
182-
183182
if shellName == cobraext.ShellInitShellDetect {
184-
shellName = stack.AutodetectedShell()
183+
shellName = stack.AutodetectShell()
185184
fmt.Fprintf(cmd.OutOrStderr(), "Detected shell: %s\n", shellName)
186-
} else {
187-
stack.SelectShell(shellName)
188185
}
189186

190187
profile, err := getProfileFlag(cmd)
191188
if err != nil {
192189
return err
193190
}
194191

195-
shellCode, err := stack.ShellInit(profile)
192+
shellCode, err := stack.ShellInit(profile, shellName)
196193
if err != nil {
197194
return errors.Wrap(err, "shellinit failed")
198195
}

‎go.mod

+22-25
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ go 1.19
55
require (
66
github.com/AlecAivazis/survey/v2 v2.3.6
77
github.com/Masterminds/semver/v3 v3.2.0
8-
github.com/ProtonMail/gopenpgp/v2 v2.5.0
8+
github.com/ProtonMail/gopenpgp/v2 v2.5.2
99
github.com/aymerick/raymond v2.0.2+incompatible
1010
github.com/boumenot/gocover-cobertura v1.2.0
1111
github.com/cespare/xxhash/v2 v2.2.0
@@ -14,10 +14,10 @@ require (
1414
github.com/elastic/go-licenser v0.4.1
1515
github.com/elastic/go-resource v0.1.1
1616
github.com/elastic/go-ucfg v0.8.6
17-
github.com/elastic/package-spec/v2 v2.2.0
18-
github.com/fatih/color v1.13.0
19-
github.com/go-git/go-billy/v5 v5.3.1
20-
github.com/go-git/go-git/v5 v5.5.1
17+
github.com/elastic/package-spec/v2 v2.5.0
18+
github.com/fatih/color v1.14.1
19+
github.com/go-git/go-billy/v5 v5.4.0
20+
github.com/go-git/go-git/v5 v5.5.2
2121
github.com/google/go-cmp v0.5.9
2222
github.com/google/go-github/v32 v32.1.0
2323
github.com/google/go-querystring v1.1.0
@@ -27,28 +27,28 @@ require (
2727
github.com/olekukonko/tablewriter v0.0.5
2828
github.com/pkg/errors v0.9.1
2929
github.com/pmezard/go-difflib v1.0.0
30-
github.com/shirou/gopsutil/v3 v3.22.11
30+
github.com/shirou/gopsutil/v3 v3.23.1
3131
github.com/spf13/cobra v1.6.1
3232
github.com/stretchr/testify v1.8.1
33-
golang.org/x/oauth2 v0.3.0
34-
golang.org/x/tools v0.4.0
33+
golang.org/x/oauth2 v0.4.0
34+
golang.org/x/tools v0.5.0
3535
gopkg.in/yaml.v3 v3.0.1
36-
gotest.tools/gotestsum v1.8.2
37-
helm.sh/helm/v3 v3.10.3
36+
gotest.tools/gotestsum v1.9.0
37+
helm.sh/helm/v3 v3.11.0
3838
honnef.co/go/tools v0.3.3
39-
k8s.io/apimachinery v0.26.0
40-
k8s.io/cli-runtime v0.26.0
41-
k8s.io/client-go v0.26.0
39+
k8s.io/apimachinery v0.26.1
40+
k8s.io/cli-runtime v0.26.1
41+
k8s.io/client-go v0.26.1
4242
)
4343

4444
require (
4545
github.com/Azure/go-ansiterm v0.0.0-20210617225240-d185dfc1b5a1 // indirect
46-
github.com/BurntSushi/toml v1.1.0 // indirect
46+
github.com/BurntSushi/toml v1.2.1 // indirect
4747
github.com/MakeNowJust/heredoc v1.0.0 // indirect
4848
github.com/Microsoft/go-winio v0.6.0 // indirect
4949
github.com/PaesslerAG/gval v1.2.1 // indirect
5050
github.com/PaesslerAG/jsonpath v0.1.1 // indirect
51-
github.com/ProtonMail/go-crypto v0.0.0-20221026131551-cf6655e29de4 // indirect
51+
github.com/ProtonMail/go-crypto v0.0.0-20230124153114-0acdc8ae009b // indirect
5252
github.com/ProtonMail/go-mime v0.0.0-20221031134845-8fd9bc37cf08 // indirect
5353
github.com/acomagu/bufpipe v1.0.3 // indirect
5454
github.com/andybalholm/brotli v1.0.4 // indirect
@@ -107,7 +107,7 @@ require (
107107
github.com/lufia/plan9stats v0.0.0-20211012122336-39d0f177ccd0 // indirect
108108
github.com/mailru/easyjson v0.7.7 // indirect
109109
github.com/mattn/go-colorable v0.1.13 // indirect
110-
github.com/mattn/go-isatty v0.0.16 // indirect
110+
github.com/mattn/go-isatty v0.0.17 // indirect
111111
github.com/mattn/go-runewidth v0.0.14 // indirect
112112
github.com/mgutz/ansi v0.0.0-20200706080929-d51e80ef957d // indirect
113113
github.com/mitchellh/go-wordwrap v1.0.1 // indirect
@@ -140,27 +140,24 @@ require (
140140
github.com/xi2/xz v0.0.0-20171230120015-48954b6210f8 // indirect
141141
github.com/xlab/treeprint v1.1.0 // indirect
142142
github.com/yusufpapurcu/wmi v1.2.2 // indirect
143-
go.etcd.io/etcd/api/v3 v3.5.6 // indirect
144143
go.mongodb.org/mongo-driver v1.11.1 // indirect
145144
go.starlark.net v0.0.0-20221205180719-3fd0dac74452 // indirect
146-
golang.org/x/crypto v0.4.0 // indirect
145+
golang.org/x/crypto v0.5.0 // indirect
147146
golang.org/x/exp/typeparams v0.0.0-20220218215828-6cf2b201936e // indirect
148147
golang.org/x/mod v0.7.0 // indirect
149-
golang.org/x/net v0.4.0 // indirect
148+
golang.org/x/net v0.5.0 // indirect
150149
golang.org/x/sync v0.1.0 // indirect
151-
golang.org/x/sys v0.3.0 // indirect
152-
golang.org/x/term v0.3.0 // indirect
153-
golang.org/x/text v0.5.0 // indirect
150+
golang.org/x/sys v0.4.0 // indirect
151+
golang.org/x/term v0.4.0 // indirect
152+
golang.org/x/text v0.6.0 // indirect
154153
golang.org/x/time v0.3.0 // indirect
155154
google.golang.org/appengine v1.6.7 // indirect
156-
google.golang.org/genproto v0.0.0-20221207170731-23e4bf6bdc37 // indirect
157-
google.golang.org/grpc v1.51.0 // indirect
158155
google.golang.org/protobuf v1.28.1 // indirect
159156
gopkg.in/inf.v0 v0.9.1 // indirect
160157
gopkg.in/warnings.v0 v0.1.2 // indirect
161158
gopkg.in/yaml.v2 v2.4.0 // indirect
162159
gotest.tools/v3 v3.4.0 // indirect
163-
k8s.io/api v0.26.0 // indirect
160+
k8s.io/api v0.26.1 // indirect
164161
k8s.io/apiextensions-apiserver v0.26.0 // indirect
165162
k8s.io/component-base v0.26.0 // indirect
166163
k8s.io/klog/v2 v2.80.1 // indirect

0 commit comments

Comments
 (0)