From c23a108ad3ad51db5f96fd9f088b4ac5b90109d2 Mon Sep 17 00:00:00 2001 From: Bradley Jones Date: Tue, 7 Mar 2023 22:51:19 +0000 Subject: [PATCH] chore: rename ecg package to pkg Signed-off-by: Bradley Jones --- cmd/cmd.go | 4 ++-- cmd/root.go | 4 ++-- internal/config/config.go | 2 +- internal/config/config_test.go | 2 +- {ecg => pkg}/connection/connection.go | 0 {ecg => pkg}/inventory/ecs.go | 0 {ecg => pkg}/inventory/report.go | 0 {ecg => pkg}/inventory/reportitem.go | 0 {ecg => pkg}/lib.go | 10 +++++----- {ecg => pkg}/logger/logger.go | 0 {ecg => pkg}/reporter/reporter.go | 4 ++-- {ecg => pkg}/reporter/reporter_test.go | 2 +- 12 files changed, 14 insertions(+), 14 deletions(-) rename {ecg => pkg}/connection/connection.go (100%) rename {ecg => pkg}/inventory/ecs.go (100%) rename {ecg => pkg}/inventory/report.go (100%) rename {ecg => pkg}/inventory/reportitem.go (100%) rename {ecg => pkg}/lib.go (88%) rename {ecg => pkg}/logger/logger.go (100%) rename {ecg => pkg}/reporter/reporter.go (94%) rename {ecg => pkg}/reporter/reporter_test.go (88%) diff --git a/cmd/cmd.go b/cmd/cmd.go index e93eb0f..5cc261c 100644 --- a/cmd/cmd.go +++ b/cmd/cmd.go @@ -7,9 +7,9 @@ import ( "github.com/spf13/cobra" "github.com/spf13/viper" - "github.com/anchore/anchore-ecs-inventory/ecg" "github.com/anchore/anchore-ecs-inventory/internal/config" "github.com/anchore/anchore-ecs-inventory/internal/logger" + "github.com/anchore/anchore-ecs-inventory/pkg" ) var ( @@ -61,7 +61,7 @@ func initLogging() { logger.InitLogger(logConfig) log = logger.Log - ecg.SetLogger(logger.Log) + pkg.SetLogger(logger.Log) } func logAppConfig() { diff --git a/cmd/root.go b/cmd/root.go index 3beca33..4e56995 100644 --- a/cmd/root.go +++ b/cmd/root.go @@ -8,8 +8,8 @@ import ( "github.com/spf13/cobra" "github.com/spf13/viper" - "github.com/anchore/anchore-ecs-inventory/ecg" "github.com/anchore/anchore-ecs-inventory/internal/config" + "github.com/anchore/anchore-ecs-inventory/pkg" ) // rootCmd represents the base command when called without any subcommands @@ -43,7 +43,7 @@ var rootCmd = &cobra.Command{ } */ - ecg.PeriodicallyGetInventoryReport(appConfig.PollingIntervalSeconds, appConfig.AnchoreDetails, appConfig.Region) + pkg.PeriodicallyGetInventoryReport(appConfig.PollingIntervalSeconds, appConfig.AnchoreDetails, appConfig.Region) }, } diff --git a/internal/config/config.go b/internal/config/config.go index d3c78a1..63101ae 100644 --- a/internal/config/config.go +++ b/internal/config/config.go @@ -20,8 +20,8 @@ import ( "github.com/spf13/viper" "gopkg.in/yaml.v2" - "github.com/anchore/anchore-ecs-inventory/ecg/connection" "github.com/anchore/anchore-ecs-inventory/internal" + "github.com/anchore/anchore-ecs-inventory/pkg/connection" ) const redacted = "******" diff --git a/internal/config/config_test.go b/internal/config/config_test.go index 5188def..0440989 100644 --- a/internal/config/config_test.go +++ b/internal/config/config_test.go @@ -6,7 +6,7 @@ import ( "github.com/spf13/viper" "github.com/stretchr/testify/assert" - "github.com/anchore/anchore-ecs-inventory/ecg/connection" + "github.com/anchore/anchore-ecs-inventory/pkg/connection" ) func TestLoadConfigFromFileCliConfigPath(t *testing.T) { diff --git a/ecg/connection/connection.go b/pkg/connection/connection.go similarity index 100% rename from ecg/connection/connection.go rename to pkg/connection/connection.go diff --git a/ecg/inventory/ecs.go b/pkg/inventory/ecs.go similarity index 100% rename from ecg/inventory/ecs.go rename to pkg/inventory/ecs.go diff --git a/ecg/inventory/report.go b/pkg/inventory/report.go similarity index 100% rename from ecg/inventory/report.go rename to pkg/inventory/report.go diff --git a/ecg/inventory/reportitem.go b/pkg/inventory/reportitem.go similarity index 100% rename from ecg/inventory/reportitem.go rename to pkg/inventory/reportitem.go diff --git a/ecg/lib.go b/pkg/lib.go similarity index 88% rename from ecg/lib.go rename to pkg/lib.go index a925481..1dd9a7f 100644 --- a/ecg/lib.go +++ b/pkg/lib.go @@ -1,4 +1,4 @@ -package ecg +package pkg import ( "encoding/json" @@ -6,10 +6,10 @@ import ( "os" "time" - "github.com/anchore/anchore-ecs-inventory/ecg/connection" - "github.com/anchore/anchore-ecs-inventory/ecg/inventory" - "github.com/anchore/anchore-ecs-inventory/ecg/logger" - "github.com/anchore/anchore-ecs-inventory/ecg/reporter" + "github.com/anchore/anchore-ecs-inventory/pkg/connection" + "github.com/anchore/anchore-ecs-inventory/pkg/inventory" + "github.com/anchore/anchore-ecs-inventory/pkg/logger" + "github.com/anchore/anchore-ecs-inventory/pkg/reporter" ) var log logger.Logger diff --git a/ecg/logger/logger.go b/pkg/logger/logger.go similarity index 100% rename from ecg/logger/logger.go rename to pkg/logger/logger.go diff --git a/ecg/reporter/reporter.go b/pkg/reporter/reporter.go similarity index 94% rename from ecg/reporter/reporter.go rename to pkg/reporter/reporter.go index 1da8010..a5a2500 100644 --- a/ecg/reporter/reporter.go +++ b/pkg/reporter/reporter.go @@ -10,9 +10,9 @@ import ( "net/url" "time" - "github.com/anchore/anchore-ecs-inventory/ecg/connection" - "github.com/anchore/anchore-ecs-inventory/ecg/inventory" "github.com/anchore/anchore-ecs-inventory/internal/logger" + "github.com/anchore/anchore-ecs-inventory/pkg/connection" + "github.com/anchore/anchore-ecs-inventory/pkg/inventory" ) const ReportAPIPath = "v1/enterprise/inventories" diff --git a/ecg/reporter/reporter_test.go b/pkg/reporter/reporter_test.go similarity index 88% rename from ecg/reporter/reporter_test.go rename to pkg/reporter/reporter_test.go index f399b07..2b0006f 100644 --- a/ecg/reporter/reporter_test.go +++ b/pkg/reporter/reporter_test.go @@ -3,7 +3,7 @@ package reporter import ( "testing" - "github.com/anchore/anchore-ecs-inventory/ecg/connection" + "github.com/anchore/anchore-ecs-inventory/pkg/connection" ) func TestBuildUrl(t *testing.T) {