Skip to content

Commit 0d7f732

Browse files
committed
Move internal/packages to pkg/packages so it can be imported
1 parent 1cf7364 commit 0d7f732

Some content is hidden

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

69 files changed

+56
-135
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
@@ -11,9 +11,9 @@ import (
1111
"github.com/spf13/cobra"
1212

1313
"github.com/elastic/elastic-package/internal/cobraext"
14-
"github.com/elastic/elastic-package/internal/packages"
15-
"github.com/elastic/elastic-package/internal/packages/installer"
1614
"github.com/elastic/elastic-package/internal/stack"
15+
"github.com/elastic/elastic-package/pkg/packages"
16+
"github.com/elastic/elastic-package/pkg/packages/installer"
1717
)
1818

1919
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
@@ -11,9 +11,9 @@ import (
1111
"github.com/spf13/cobra"
1212

1313
"github.com/elastic/elastic-package/internal/cobraext"
14-
"github.com/elastic/elastic-package/internal/packages"
15-
"github.com/elastic/elastic-package/internal/packages/installer"
1614
"github.com/elastic/elastic-package/internal/stack"
15+
"github.com/elastic/elastic-package/pkg/packages"
16+
"github.com/elastic/elastic-package/pkg/packages/installer"
1717
)
1818

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

internal/benchrunner/runners/pipeline/runner.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@ import (
1616
"github.com/elastic/elastic-package/internal/benchrunner"
1717
"github.com/elastic/elastic-package/internal/benchrunner/reporters"
1818
"github.com/elastic/elastic-package/internal/elasticsearch/ingest"
19-
"github.com/elastic/elastic-package/internal/packages"
2019
"github.com/elastic/elastic-package/internal/testrunner"
20+
"github.com/elastic/elastic-package/pkg/packages"
2121
)
2222

2323
const (

internal/benchrunner/runners/system/runner.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -31,9 +31,9 @@ import (
3131
"github.com/elastic/elastic-package/internal/kibana"
3232
"github.com/elastic/elastic-package/internal/logger"
3333
"github.com/elastic/elastic-package/internal/multierror"
34-
"github.com/elastic/elastic-package/internal/packages"
3534
"github.com/elastic/elastic-package/internal/servicedeployer"
3635
"github.com/elastic/elastic-package/internal/signal"
36+
"github.com/elastic/elastic-package/pkg/packages"
3737
)
3838

3939
const (

internal/builder/dynamic_mappings.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@ import (
1818

1919
"github.com/elastic/elastic-package/internal/formatter"
2020
"github.com/elastic/elastic-package/internal/logger"
21-
"github.com/elastic/elastic-package/internal/packages"
22-
"github.com/elastic/elastic-package/internal/packages/buildmanifest"
21+
"github.com/elastic/elastic-package/pkg/packages"
22+
"github.com/elastic/elastic-package/pkg/packages/buildmanifest"
2323
)
2424

2525
//go:embed _static/ecs_mappings.yaml

internal/builder/external_fields.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ import (
1414
"github.com/elastic/elastic-package/internal/common"
1515
"github.com/elastic/elastic-package/internal/fields"
1616
"github.com/elastic/elastic-package/internal/logger"
17-
"github.com/elastic/elastic-package/internal/packages/buildmanifest"
17+
"github.com/elastic/elastic-package/pkg/packages/buildmanifest"
1818
)
1919

2020
func resolveExternalFields(packageRoot, destinationDir string) error {

internal/builder/packages.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ import (
1717
"github.com/elastic/elastic-package/internal/environment"
1818
"github.com/elastic/elastic-package/internal/files"
1919
"github.com/elastic/elastic-package/internal/logger"
20-
"github.com/elastic/elastic-package/internal/packages"
20+
"github.com/elastic/elastic-package/pkg/packages"
2121
)
2222

2323
const builtPackagesFolder = "packages"

internal/cleanup/build.go

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

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

1818
// Build function removes package resources from build/.

internal/cleanup/stack.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ import (
1111
"path/filepath"
1212

1313
"github.com/elastic/elastic-package/internal/configuration/locations"
14-
"github.com/elastic/elastic-package/internal/packages"
14+
"github.com/elastic/elastic-package/pkg/packages"
1515

1616
"github.com/elastic/elastic-package/internal/logger"
1717
)

internal/docs/readme.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ import (
1616

1717
"github.com/elastic/elastic-package/internal/builder"
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
// ReadmeFile contains file name and status of each readme file.

internal/elasticsearch/ingest/datastream.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ import (
1818
"gopkg.in/yaml.v3"
1919

2020
"github.com/elastic/elastic-package/internal/elasticsearch"
21-
"github.com/elastic/elastic-package/internal/packages"
21+
"github.com/elastic/elastic-package/pkg/packages"
2222
)
2323

2424
var (

internal/export/dashboards.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ import (
1515
"github.com/elastic/elastic-package/internal/common"
1616
"github.com/elastic/elastic-package/internal/kibana"
1717
"github.com/elastic/elastic-package/internal/logger"
18-
"github.com/elastic/elastic-package/internal/packages"
18+
"github.com/elastic/elastic-package/pkg/packages"
1919
)
2020

2121
// Dashboards method exports selected dashboards with references objects. All Kibana objects are saved to local files

internal/fields/dependency_manager.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ import (
1818
"github.com/elastic/elastic-package/internal/common"
1919
"github.com/elastic/elastic-package/internal/configuration/locations"
2020
"github.com/elastic/elastic-package/internal/logger"
21-
"github.com/elastic/elastic-package/internal/packages/buildmanifest"
21+
"github.com/elastic/elastic-package/pkg/packages/buildmanifest"
2222
)
2323

2424
const (

internal/fields/validate.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,8 @@ import (
2424
"github.com/elastic/elastic-package/internal/common"
2525
"github.com/elastic/elastic-package/internal/logger"
2626
"github.com/elastic/elastic-package/internal/multierror"
27-
"github.com/elastic/elastic-package/internal/packages"
28-
"github.com/elastic/elastic-package/internal/packages/buildmanifest"
27+
"github.com/elastic/elastic-package/pkg/packages"
28+
"github.com/elastic/elastic-package/pkg/packages/buildmanifest"
2929
)
3030

3131
var (

internal/kibana/packages.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import (
1010
"net/http"
1111
"os"
1212

13-
"github.com/elastic/elastic-package/internal/packages"
13+
"github.com/elastic/elastic-package/pkg/packages"
1414
)
1515

1616
// InstallPackage installs the given package in Fleet.

internal/kibana/policies.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import (
99
"fmt"
1010
"net/http"
1111

12-
"github.com/elastic/elastic-package/internal/packages"
12+
"github.com/elastic/elastic-package/pkg/packages"
1313
)
1414

1515
// Policy represents an Agent Policy in Fleet.

internal/registry/revisions.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ import (
1313
"github.com/Masterminds/semver/v3"
1414
"github.com/google/go-querystring/query"
1515

16-
"github.com/elastic/elastic-package/internal/packages"
16+
"github.com/elastic/elastic-package/pkg/packages"
1717
)
1818

1919
// SearchOptions specify the query parameters without the package name for the search API

internal/testrunner/runners/asset/runner.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@ import (
1010

1111
"github.com/elastic/elastic-package/internal/kibana"
1212
"github.com/elastic/elastic-package/internal/logger"
13-
"github.com/elastic/elastic-package/internal/packages"
14-
"github.com/elastic/elastic-package/internal/packages/installer"
1513
"github.com/elastic/elastic-package/internal/testrunner"
14+
"github.com/elastic/elastic-package/pkg/packages"
15+
"github.com/elastic/elastic-package/pkg/packages/installer"
1616
)
1717

1818
func init() {

internal/testrunner/runners/pipeline/coverage.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@ import (
1212
"time"
1313

1414
"github.com/elastic/elastic-package/internal/elasticsearch/ingest"
15-
"github.com/elastic/elastic-package/internal/packages"
1615
"github.com/elastic/elastic-package/internal/testrunner"
16+
"github.com/elastic/elastic-package/pkg/packages"
1717
)
1818

1919
// GetPipelineCoverage returns a coverage report for the provided set of ingest pipelines.

internal/testrunner/runners/pipeline/runner.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,9 @@ import (
2121
"github.com/elastic/elastic-package/internal/fields"
2222
"github.com/elastic/elastic-package/internal/logger"
2323
"github.com/elastic/elastic-package/internal/multierror"
24-
"github.com/elastic/elastic-package/internal/packages"
2524
"github.com/elastic/elastic-package/internal/signal"
2625
"github.com/elastic/elastic-package/internal/testrunner"
26+
"github.com/elastic/elastic-package/pkg/packages"
2727
)
2828

2929
const (

internal/testrunner/runners/static/runner.go

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

1313
"github.com/elastic/elastic-package/internal/fields"
1414
"github.com/elastic/elastic-package/internal/logger"
15-
"github.com/elastic/elastic-package/internal/packages"
1615
"github.com/elastic/elastic-package/internal/testrunner"
16+
"github.com/elastic/elastic-package/pkg/packages"
1717
)
1818

1919
const sampleEventJSON = "sample_event.json"

internal/testrunner/runners/system/runner.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -25,12 +25,12 @@ import (
2525
"github.com/elastic/elastic-package/internal/kibana"
2626
"github.com/elastic/elastic-package/internal/logger"
2727
"github.com/elastic/elastic-package/internal/multierror"
28-
"github.com/elastic/elastic-package/internal/packages"
29-
"github.com/elastic/elastic-package/internal/packages/installer"
3028
"github.com/elastic/elastic-package/internal/servicedeployer"
3129
"github.com/elastic/elastic-package/internal/signal"
3230
"github.com/elastic/elastic-package/internal/stack"
3331
"github.com/elastic/elastic-package/internal/testrunner"
32+
"github.com/elastic/elastic-package/pkg/packages"
33+
"github.com/elastic/elastic-package/pkg/packages/installer"
3434
)
3535

3636
const (

internal/testrunner/runners/system/runner_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,9 @@ import (
1616
"github.com/stretchr/testify/assert"
1717
"github.com/stretchr/testify/require"
1818

19-
"github.com/elastic/elastic-package/internal/packages"
2019
"github.com/elastic/elastic-package/internal/stack"
2120
"github.com/elastic/elastic-package/internal/testrunner"
21+
"github.com/elastic/elastic-package/pkg/packages"
2222
)
2323

2424
func TestFindPolicyTemplateForInput(t *testing.T) {

internal/packages/archetype/data_stream.go renamed to pkg/packages/archetype/data_stream.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ import (
1111

1212
"github.com/elastic/elastic-package/internal/formatter"
1313
"github.com/elastic/elastic-package/internal/logger"
14-
"github.com/elastic/elastic-package/internal/packages"
14+
"github.com/elastic/elastic-package/pkg/packages"
1515
)
1616

1717
// DataStreamDescriptor defines configurable properties of the data stream archetype

internal/packages/archetype/data_stream_test.go renamed to pkg/packages/archetype/data_stream_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ import (
1111

1212
"github.com/stretchr/testify/require"
1313

14-
"github.com/elastic/elastic-package/internal/packages"
14+
"github.com/elastic/elastic-package/pkg/packages"
1515
)
1616

1717
func TestDataStream(t *testing.T) {

internal/packages/archetype/package.go renamed to pkg/packages/archetype/package.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ import (
1212
"github.com/elastic/elastic-package/internal/formatter"
1313
"github.com/elastic/elastic-package/internal/licenses"
1414
"github.com/elastic/elastic-package/internal/logger"
15-
"github.com/elastic/elastic-package/internal/packages"
15+
"github.com/elastic/elastic-package/pkg/packages"
1616
)
1717

1818
// PackageDescriptor defines configurable properties of the package archetype

internal/packages/archetype/package_test.go renamed to pkg/packages/archetype/package_test.go

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

1414
"github.com/stretchr/testify/require"
1515

16-
"github.com/elastic/elastic-package/internal/packages"
16+
"github.com/elastic/elastic-package/pkg/packages"
1717
)
1818

1919
func TestPackage(t *testing.T) {
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.

0 commit comments

Comments
 (0)