Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/main' into profile-resources
Browse files Browse the repository at this point in the history
  • Loading branch information
jsoriano committed Feb 3, 2023
2 parents a17fcdd + 599941d commit d964ab5
Show file tree
Hide file tree
Showing 58 changed files with 1,467 additions and 164 deletions.
28 changes: 28 additions & 0 deletions .buildkite/pipeline.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
steps:
- label: ":go: Run check-static"
command: "make check-static"
agents:
image: "golang:1.19.5"
cpu: "8"
memory: "4G"

- label: ":go: Run unit tests"
command: "make test-go-ci"
artifact_paths:
- "build/test-results/*.xml"
- "build/test-coverage/*.xml"
agents:
image: "golang:1.19.5"
cpu: "8"
memory: "4G"

- wait: ~
continue_on_failure: true

- label: "Junit annotate"
plugins:
- junit-annotate#v2.4.1:
artifacts: "build/test-results/*.xml"
agents:
provider: "gcp"

20 changes: 20 additions & 0 deletions .buildkite/pull-requests.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
{
"jobs": [
{
"enabled": true,
"pipelineSlug": "elastic-package",
"allow_org_users": true,
"allowed_repo_permissions": ["admin", "write"],
"allowed_list": ["dependabot[bot]", "mergify[bot]"],
"set_commit_status": true,
"build_on_commit": true,
"build_on_comment": true,
"trigger_comment_regex": "^(?:(?:buildkite\\W+)?(?:build|test)\\W+(?:this|it))",
"always_trigger_comment_regex": "^(?:(?:buildkite\\W+)?(?:build|test)\\W+(?:this|it))",
"skip_ci_labels": [ ],
"skip_target_branches": [ ],
"skip_ci_on_only_changed": [ ],
"always_require_ci_on_changed": [ ]
}
]
}
4 changes: 2 additions & 2 deletions .ci/Jenkinsfile
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@ pipeline {
PIPELINE_LOG_LEVEL='INFO'
AWS_ACCOUNT_SECRET = 'secret/observability-team/ci/elastic-observability-aws-account-auth'
HOME = "${env.WORKSPACE}"
KIND_VERSION = 'v0.14.0'
K8S_VERSION = 'v1.25.0'
KIND_VERSION = 'v0.17.0'
K8S_VERSION = 'v1.26.0'
JOB_GCS_BUCKET = 'fleet-ci-temp'
JOB_GCS_BUCKET_INTERNAL = 'fleet-ci-temp-internal'
JOB_GCS_CREDENTIALS = 'fleet-ci-gcs-plugin'
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/add-issues-to-ingest-board.yml
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ jobs:
if: github.event.label.name == env.ECOSYSTEM_LABEL
with:
query: |
mutation updateIngestArea($item_id: ID!, $project_id: ID!, $areaField_id: ID!, $area_id: String) {
mutation updateIngestArea($item_id: ID!, $project_id: ID!, $area_field_id: ID!, $area_id: String) {
updateProjectV2ItemFieldValue(
input: { itemId: $item_id, projectId: $project_id, fieldId: $area_field_id, value: { singleSelectOptionId: $area_id } }) {
clientMutationId
Expand Down
39 changes: 0 additions & 39 deletions .github/workflows/add-to-ecosystem-project.yml

This file was deleted.

2 changes: 1 addition & 1 deletion .go-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
1.19.1
1.19.5
7 changes: 2 additions & 5 deletions cmd/stack.go
Original file line number Diff line number Diff line change
Expand Up @@ -179,20 +179,17 @@ func setupStackCommand() *cobraext.Command {
if err != nil {
return cobraext.FlagParsingError(err, cobraext.ShellInitShellFlagName)
}

if shellName == cobraext.ShellInitShellDetect {
shellName = stack.AutodetectedShell()
shellName = stack.AutodetectShell()
fmt.Fprintf(cmd.OutOrStderr(), "Detected shell: %s\n", shellName)
} else {
stack.SelectShell(shellName)
}

profile, err := getProfileFlag(cmd)
if err != nil {
return err
}

shellCode, err := stack.ShellInit(profile)
shellCode, err := stack.ShellInit(profile, shellName)
if err != nil {
return errors.Wrap(err, "shellinit failed")
}
Expand Down
47 changes: 22 additions & 25 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ go 1.19
require (
github.com/AlecAivazis/survey/v2 v2.3.6
github.com/Masterminds/semver/v3 v3.2.0
github.com/ProtonMail/gopenpgp/v2 v2.5.0
github.com/ProtonMail/gopenpgp/v2 v2.5.2
github.com/aymerick/raymond v2.0.2+incompatible
github.com/boumenot/gocover-cobertura v1.2.0
github.com/cespare/xxhash/v2 v2.2.0
Expand All @@ -14,10 +14,10 @@ require (
github.com/elastic/go-licenser v0.4.1
github.com/elastic/go-resource v0.1.1
github.com/elastic/go-ucfg v0.8.6
github.com/elastic/package-spec/v2 v2.2.0
github.com/fatih/color v1.13.0
github.com/go-git/go-billy/v5 v5.3.1
github.com/go-git/go-git/v5 v5.5.1
github.com/elastic/package-spec/v2 v2.5.0
github.com/fatih/color v1.14.1
github.com/go-git/go-billy/v5 v5.4.0
github.com/go-git/go-git/v5 v5.5.2
github.com/google/go-cmp v0.5.9
github.com/google/go-github/v32 v32.1.0
github.com/google/go-querystring v1.1.0
Expand All @@ -27,28 +27,28 @@ require (
github.com/olekukonko/tablewriter v0.0.5
github.com/pkg/errors v0.9.1
github.com/pmezard/go-difflib v1.0.0
github.com/shirou/gopsutil/v3 v3.22.11
github.com/shirou/gopsutil/v3 v3.23.1
github.com/spf13/cobra v1.6.1
github.com/stretchr/testify v1.8.1
golang.org/x/oauth2 v0.3.0
golang.org/x/tools v0.4.0
golang.org/x/oauth2 v0.4.0
golang.org/x/tools v0.5.0
gopkg.in/yaml.v3 v3.0.1
gotest.tools/gotestsum v1.8.2
helm.sh/helm/v3 v3.10.3
gotest.tools/gotestsum v1.9.0
helm.sh/helm/v3 v3.11.0
honnef.co/go/tools v0.3.3
k8s.io/apimachinery v0.26.0
k8s.io/cli-runtime v0.26.0
k8s.io/client-go v0.26.0
k8s.io/apimachinery v0.26.1
k8s.io/cli-runtime v0.26.1
k8s.io/client-go v0.26.1
)

require (
github.com/Azure/go-ansiterm v0.0.0-20210617225240-d185dfc1b5a1 // indirect
github.com/BurntSushi/toml v1.1.0 // indirect
github.com/BurntSushi/toml v1.2.1 // indirect
github.com/MakeNowJust/heredoc v1.0.0 // indirect
github.com/Microsoft/go-winio v0.6.0 // indirect
github.com/PaesslerAG/gval v1.2.1 // indirect
github.com/PaesslerAG/jsonpath v0.1.1 // indirect
github.com/ProtonMail/go-crypto v0.0.0-20221026131551-cf6655e29de4 // indirect
github.com/ProtonMail/go-crypto v0.0.0-20230124153114-0acdc8ae009b // indirect
github.com/ProtonMail/go-mime v0.0.0-20221031134845-8fd9bc37cf08 // indirect
github.com/acomagu/bufpipe v1.0.3 // indirect
github.com/andybalholm/brotli v1.0.4 // indirect
Expand Down Expand Up @@ -107,7 +107,7 @@ require (
github.com/lufia/plan9stats v0.0.0-20211012122336-39d0f177ccd0 // indirect
github.com/mailru/easyjson v0.7.7 // indirect
github.com/mattn/go-colorable v0.1.13 // indirect
github.com/mattn/go-isatty v0.0.16 // indirect
github.com/mattn/go-isatty v0.0.17 // indirect
github.com/mattn/go-runewidth v0.0.14 // indirect
github.com/mgutz/ansi v0.0.0-20200706080929-d51e80ef957d // indirect
github.com/mitchellh/go-wordwrap v1.0.1 // indirect
Expand Down Expand Up @@ -140,27 +140,24 @@ require (
github.com/xi2/xz v0.0.0-20171230120015-48954b6210f8 // indirect
github.com/xlab/treeprint v1.1.0 // indirect
github.com/yusufpapurcu/wmi v1.2.2 // indirect
go.etcd.io/etcd/api/v3 v3.5.6 // indirect
go.mongodb.org/mongo-driver v1.11.1 // indirect
go.starlark.net v0.0.0-20221205180719-3fd0dac74452 // indirect
golang.org/x/crypto v0.4.0 // indirect
golang.org/x/crypto v0.5.0 // indirect
golang.org/x/exp/typeparams v0.0.0-20220218215828-6cf2b201936e // indirect
golang.org/x/mod v0.7.0 // indirect
golang.org/x/net v0.4.0 // indirect
golang.org/x/net v0.5.0 // indirect
golang.org/x/sync v0.1.0 // indirect
golang.org/x/sys v0.3.0 // indirect
golang.org/x/term v0.3.0 // indirect
golang.org/x/text v0.5.0 // indirect
golang.org/x/sys v0.4.0 // indirect
golang.org/x/term v0.4.0 // indirect
golang.org/x/text v0.6.0 // indirect
golang.org/x/time v0.3.0 // indirect
google.golang.org/appengine v1.6.7 // indirect
google.golang.org/genproto v0.0.0-20221207170731-23e4bf6bdc37 // indirect
google.golang.org/grpc v1.51.0 // indirect
google.golang.org/protobuf v1.28.1 // indirect
gopkg.in/inf.v0 v0.9.1 // indirect
gopkg.in/warnings.v0 v0.1.2 // indirect
gopkg.in/yaml.v2 v2.4.0 // indirect
gotest.tools/v3 v3.4.0 // indirect
k8s.io/api v0.26.0 // indirect
k8s.io/api v0.26.1 // indirect
k8s.io/apiextensions-apiserver v0.26.0 // indirect
k8s.io/component-base v0.26.0 // indirect
k8s.io/klog/v2 v2.80.1 // indirect
Expand Down
Loading

0 comments on commit d964ab5

Please sign in to comment.