Skip to content

Commit b291256

Browse files
marc-grmarc-gr
committed
Move internal/packages to pkg/packages so it can be imported
1 parent 3474f55 commit b291256

Some content is hidden

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

75 files changed

+67
-189
lines changed

‎cmd/benchmark.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -29,9 +29,9 @@ import (
2929
"github.com/elastic/elastic-package/internal/benchrunner/runners/system"
3030
"github.com/elastic/elastic-package/internal/cobraext"
3131
"github.com/elastic/elastic-package/internal/common"
32-
"github.com/elastic/elastic-package/internal/packages"
3332
"github.com/elastic/elastic-package/internal/signal"
3433
"github.com/elastic/elastic-package/internal/testrunner"
34+
"github.com/elastic/elastic-package/pkg/packages"
3535
)
3636

3737
const generateLongDescription = `

‎cmd/build.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ import (
1616
"github.com/elastic/elastic-package/internal/docs"
1717
"github.com/elastic/elastic-package/internal/files"
1818
"github.com/elastic/elastic-package/internal/logger"
19-
"github.com/elastic/elastic-package/internal/packages"
19+
"github.com/elastic/elastic-package/pkg/packages"
2020
)
2121

2222
const buildLongDescription = `Use this command to build a package. Currently it supports only the "integration" package type.

‎cmd/changelog.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@ import (
1414
"github.com/spf13/cobra"
1515

1616
"github.com/elastic/elastic-package/internal/cobraext"
17-
"github.com/elastic/elastic-package/internal/packages"
18-
"github.com/elastic/elastic-package/internal/packages/changelog"
17+
"github.com/elastic/elastic-package/pkg/packages"
18+
"github.com/elastic/elastic-package/pkg/packages/changelog"
1919
)
2020

2121
const changelogLongDescription = `Use this command to work with the changelog of the package.

‎cmd/create_data_stream.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,9 @@ import (
1212

1313
"github.com/spf13/cobra"
1414

15-
"github.com/elastic/elastic-package/internal/packages"
16-
"github.com/elastic/elastic-package/internal/packages/archetype"
1715
"github.com/elastic/elastic-package/internal/surveyext"
16+
"github.com/elastic/elastic-package/pkg/packages"
17+
"github.com/elastic/elastic-package/pkg/packages/archetype"
1818
)
1919

2020
const createDataStreamLongDescription = `Use this command to create a new data stream.

‎cmd/create_package.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,9 @@ import (
1111
"github.com/spf13/cobra"
1212

1313
"github.com/elastic/elastic-package/internal/licenses"
14-
"github.com/elastic/elastic-package/internal/packages"
15-
"github.com/elastic/elastic-package/internal/packages/archetype"
1614
"github.com/elastic/elastic-package/internal/surveyext"
15+
"github.com/elastic/elastic-package/pkg/packages"
16+
"github.com/elastic/elastic-package/pkg/packages/archetype"
1717
)
1818

1919
const createPackageLongDescription = `Use this command to create a new package.

‎cmd/format.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ import (
1212

1313
"github.com/elastic/elastic-package/internal/cobraext"
1414
"github.com/elastic/elastic-package/internal/formatter"
15-
"github.com/elastic/elastic-package/internal/packages"
15+
"github.com/elastic/elastic-package/pkg/packages"
1616
)
1717

1818
const formatLongDescription = `Use this command to format the package files.

‎cmd/install.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,9 @@ import (
1212

1313
"github.com/elastic/elastic-package/internal/cobraext"
1414
"github.com/elastic/elastic-package/internal/install"
15-
"github.com/elastic/elastic-package/internal/packages"
16-
"github.com/elastic/elastic-package/internal/packages/installer"
1715
"github.com/elastic/elastic-package/internal/stack"
16+
"github.com/elastic/elastic-package/pkg/packages"
17+
"github.com/elastic/elastic-package/pkg/packages/installer"
1818
)
1919

2020
const installLongDescription = `Use this command to install the package in Kibana.

‎cmd/lint.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ import (
1414

1515
"github.com/elastic/elastic-package/internal/cobraext"
1616
"github.com/elastic/elastic-package/internal/docs"
17-
"github.com/elastic/elastic-package/internal/packages"
17+
"github.com/elastic/elastic-package/pkg/packages"
1818
)
1919

2020
const lintLongDescription = `Use this command to validate the contents of a package using the package specification (see: https://github.com/elastic/package-spec).

‎cmd/service.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,10 @@ import (
1313

1414
"github.com/elastic/elastic-package/internal/cobraext"
1515
"github.com/elastic/elastic-package/internal/install"
16-
"github.com/elastic/elastic-package/internal/packages"
1716
"github.com/elastic/elastic-package/internal/service"
1817
"github.com/elastic/elastic-package/internal/stack"
1918
"github.com/elastic/elastic-package/internal/testrunner/runners/system"
19+
"github.com/elastic/elastic-package/pkg/packages"
2020
)
2121

2222
const serviceLongDescription = `Use this command to boot up the service stack that can be observed with the package.

‎cmd/status.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,10 @@ import (
1818
"github.com/spf13/cobra"
1919

2020
"github.com/elastic/elastic-package/internal/cobraext"
21-
"github.com/elastic/elastic-package/internal/packages"
22-
"github.com/elastic/elastic-package/internal/packages/changelog"
23-
"github.com/elastic/elastic-package/internal/packages/status"
2421
"github.com/elastic/elastic-package/internal/registry"
22+
"github.com/elastic/elastic-package/pkg/packages"
23+
"github.com/elastic/elastic-package/pkg/packages/changelog"
24+
"github.com/elastic/elastic-package/pkg/packages/status"
2525
)
2626

2727
const statusLongDescription = `Use this command to display the current deployment status of a package.

‎cmd/status_test.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,9 @@ import (
1313
"github.com/stretchr/testify/assert"
1414
"github.com/stretchr/testify/require"
1515

16-
"github.com/elastic/elastic-package/internal/packages"
17-
"github.com/elastic/elastic-package/internal/packages/changelog"
18-
"github.com/elastic/elastic-package/internal/packages/status"
16+
"github.com/elastic/elastic-package/pkg/packages"
17+
"github.com/elastic/elastic-package/pkg/packages/changelog"
18+
"github.com/elastic/elastic-package/pkg/packages/status"
1919
)
2020

2121
var generateFlag = flag.Bool("generate", false, "Write golden files")

‎cmd/testrunner.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,13 +16,13 @@ import (
1616
"github.com/elastic/elastic-package/internal/cobraext"
1717
"github.com/elastic/elastic-package/internal/common"
1818
"github.com/elastic/elastic-package/internal/install"
19-
"github.com/elastic/elastic-package/internal/packages"
2019
"github.com/elastic/elastic-package/internal/signal"
2120
"github.com/elastic/elastic-package/internal/stack"
2221
"github.com/elastic/elastic-package/internal/testrunner"
2322
"github.com/elastic/elastic-package/internal/testrunner/reporters/formats"
2423
"github.com/elastic/elastic-package/internal/testrunner/reporters/outputs"
2524
_ "github.com/elastic/elastic-package/internal/testrunner/runners" // register all test runners
25+
"github.com/elastic/elastic-package/pkg/packages"
2626
)
2727

2828
const testLongDescription = `Use this command to run tests on a package. Currently, the following types of tests are available:

‎cmd/uninstall.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,9 @@ import (
1212

1313
"github.com/elastic/elastic-package/internal/cobraext"
1414
"github.com/elastic/elastic-package/internal/install"
15-
"github.com/elastic/elastic-package/internal/packages"
16-
"github.com/elastic/elastic-package/internal/packages/installer"
1715
"github.com/elastic/elastic-package/internal/stack"
16+
"github.com/elastic/elastic-package/pkg/packages"
17+
"github.com/elastic/elastic-package/pkg/packages/installer"
1818
)
1919

2020
const uninstallLongDescription = `Use this command to uninstall the package in Kibana.

‎go.mod

+1-14
Original file line numberDiff line numberDiff line change
@@ -28,14 +28,11 @@ require (
2828
github.com/hashicorp/go-plugin v1.5.0
2929
github.com/jedib0t/go-pretty v4.3.0+incompatible
3030
github.com/magefile/mage v1.15.0
31-
github.com/mattn/go-sqlite3 v1.14.17
3231
github.com/mholt/archiver/v3 v3.5.1
33-
github.com/mikefarah/yq/v4 v4.35.1
3432
github.com/olekukonko/tablewriter v0.0.5
3533
github.com/pmezard/go-difflib v1.0.0
3634
github.com/shirou/gopsutil/v3 v3.23.8
3735
github.com/spf13/cobra v1.7.0
38-
github.com/spf13/pflag v1.0.5
3936
github.com/stretchr/testify v1.8.4
4037
golang.org/x/tools v0.13.0
4138
gopkg.in/yaml.v3 v3.0.1
@@ -60,9 +57,7 @@ require (
6057
github.com/Pallinder/go-randomdata v1.2.0 // indirect
6158
github.com/ProtonMail/go-crypto v0.0.0-20230828082145-3c4c8a2d2371 // indirect
6259
github.com/ProtonMail/go-mime v0.0.0-20230322103455-7d82a3887f2f // indirect
63-
github.com/a8m/envsubst v1.4.2 // indirect
6460
github.com/acomagu/bufpipe v1.0.4 // indirect
65-
github.com/alecthomas/participle/v2 v2.0.0 // indirect
6661
github.com/andybalholm/brotli v1.0.4 // indirect
6762
github.com/asaskevich/govalidator v0.0.0-20210307081110-f21760c49a8d // indirect
6863
github.com/c-bata/go-prompt v0.2.6 // indirect
@@ -71,11 +66,9 @@ require (
7166
github.com/creasty/defaults v1.7.0 // indirect
7267
github.com/cyphar/filepath-securejoin v0.2.4 // indirect
7368
github.com/davecgh/go-spew v1.1.1 // indirect
74-
github.com/dimchansky/utfbom v1.1.1 // indirect
7569
github.com/dnephin/pflag v1.0.7 // indirect
7670
github.com/dsnet/compress v0.0.2-0.20210315054119-f66993602bf5 // indirect
7771
github.com/elastic/gojsonschema v1.2.1 // indirect
78-
github.com/elliotchance/orderedmap v1.5.0 // indirect
7972
github.com/emicklei/go-restful/v3 v3.10.1 // indirect
8073
github.com/emirpasic/gods v1.18.1 // indirect
8174
github.com/evanphx/json-patch v5.6.0+incompatible // indirect
@@ -91,8 +84,6 @@ require (
9184
github.com/go-openapi/jsonreference v0.20.2 // indirect
9285
github.com/go-openapi/strfmt v0.21.3 // indirect
9386
github.com/go-openapi/swag v0.22.3 // indirect
94-
github.com/goccy/go-json v0.10.2 // indirect
95-
github.com/goccy/go-yaml v1.11.0 // indirect
9687
github.com/gogo/protobuf v1.3.2 // indirect
9788
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
9889
github.com/golang/protobuf v1.5.3 // indirect
@@ -110,7 +101,6 @@ require (
110101
github.com/imdario/mergo v0.3.15 // indirect
111102
github.com/inconshreveable/mousetrap v1.1.0 // indirect
112103
github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99 // indirect
113-
github.com/jinzhu/copier v0.3.5 // indirect
114104
github.com/joeshaw/multierror v0.0.0-20140124173710-69b34d4ec901 // indirect
115105
github.com/josharian/intern v1.0.0 // indirect
116106
github.com/json-iterator/go v1.1.12 // indirect
@@ -121,7 +111,6 @@ require (
121111
github.com/liggitt/tabwriter v0.0.0-20181228230101-89fcab3d43de // indirect
122112
github.com/lithammer/shortuuid/v3 v3.0.7 // indirect
123113
github.com/lufia/plan9stats v0.0.0-20211012122336-39d0f177ccd0 // indirect
124-
github.com/magiconair/properties v1.8.7 // indirect
125114
github.com/mailru/easyjson v0.7.7 // indirect
126115
github.com/mattn/go-colorable v0.1.13 // indirect
127116
github.com/mattn/go-isatty v0.0.17 // indirect
@@ -142,7 +131,6 @@ require (
142131
github.com/nwaples/rardecode v1.1.3 // indirect
143132
github.com/oklog/run v1.0.0 // indirect
144133
github.com/oklog/ulid v1.3.1 // indirect
145-
github.com/pelletier/go-toml/v2 v2.0.9 // indirect
146134
github.com/peterbourgon/diskv v2.0.1+incompatible // indirect
147135
github.com/pierrec/lz4/v4 v4.1.17 // indirect
148136
github.com/pjbgf/sha1cd v0.3.0 // indirect
@@ -156,6 +144,7 @@ require (
156144
github.com/shopspring/decimal v1.3.1 // indirect
157145
github.com/skeema/knownhosts v1.2.0 // indirect
158146
github.com/spf13/cast v1.5.0 // indirect
147+
github.com/spf13/pflag v1.0.5 // indirect
159148
github.com/tklauser/go-sysconf v0.3.12 // indirect
160149
github.com/tklauser/numcpus v0.6.1 // indirect
161150
github.com/ulikunitz/xz v0.5.11 // indirect
@@ -177,13 +166,11 @@ require (
177166
golang.org/x/term v0.12.0 // indirect
178167
golang.org/x/text v0.13.0 // indirect
179168
golang.org/x/time v0.3.0 // indirect
180-
golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2 // indirect
181169
google.golang.org/appengine v1.6.7 // indirect
182170
google.golang.org/genproto/googleapis/rpc v0.0.0-20230525234030-28d5490b6b19 // indirect
183171
google.golang.org/grpc v1.54.0 // indirect
184172
google.golang.org/protobuf v1.30.0 // indirect
185173
gopkg.in/inf.v0 v0.9.1 // indirect
186-
gopkg.in/op/go-logging.v1 v1.0.0-20160211212156-b2cb9fa56473 // indirect
187174
gopkg.in/warnings.v0 v0.1.2 // indirect
188175
gopkg.in/yaml.v2 v2.4.0 // indirect
189176
k8s.io/api v0.28.2 // indirect

0 commit comments

Comments
 (0)