Move common package into CLI (aws#20)

bioinfonerd-forks · Sep 27, 2021 · 457f231 · 457f231
1 parent 778967c
commit 457f231
Show file tree

Hide file tree

Showing 175 changed files with 292 additions and 379 deletions.
diff --git a/.gitignore b/.gitignore
@@ -6,7 +6,6 @@ venv
 .venv
 *.iml
 coverage.out
-/packages/common/bin/
 vendor
 /docs/
 /site/content/en/docs/Reference/agc*
diff --git a/packages/cli/Makefile b/packages/cli/Makefile
@@ -7,7 +7,7 @@ COVERAGE=coverage.out
 DESTINATION=./bin/local/${BINARY_NAME}
 VERSION=$(shell git describe --always --tags)
 
-LINKER_FLAGS=-X github.com/aws/amazon-genomics-cli/cli/internal/pkg/version.Version=${VERSION}
+LINKER_FLAGS=-X github.com/aws/amazon-genomics-cli/internal/pkg/version.Version=${VERSION}
 # RELEASE_BUILD_LINKER_FLAGS disables DWARF and symbol table generation to reduce binary size
 RELEASE_BUILD_LINKER_FLAGS=-s -w
 

diff --git a/packages/cli/cmd/application/main.go b/packages/cli/cmd/application/main.go
@@ -12,12 +12,12 @@ import (
 	"strings"
 	"time"
 
-	"github.com/aws/amazon-genomics-cli/cli/cmd/application/template"
-	"github.com/aws/amazon-genomics-cli/cli/internal/pkg/cli"
-	"github.com/aws/amazon-genomics-cli/cli/internal/pkg/cli/clierror"
-	"github.com/aws/amazon-genomics-cli/cli/internal/pkg/term/color"
-	"github.com/aws/amazon-genomics-cli/cli/internal/pkg/version"
-	"github.com/aws/amazon-genomics-cli/common/logging"
+	"github.com/aws/amazon-genomics-cli/cmd/application/template"
+	"github.com/aws/amazon-genomics-cli/internal/pkg/cli"
+	"github.com/aws/amazon-genomics-cli/internal/pkg/cli/clierror"
+	"github.com/aws/amazon-genomics-cli/internal/pkg/logging"
+	"github.com/aws/amazon-genomics-cli/internal/pkg/term/color"
+	"github.com/aws/amazon-genomics-cli/internal/pkg/version"
 	"github.com/rs/zerolog"
 	"github.com/rs/zerolog/log"
 	"github.com/spf13/cobra"

diff --git a/packages/cli/cmd/application/template/macro.go b/packages/cli/cmd/application/template/macro.go
@@ -7,7 +7,7 @@ package template
 import (
 	"strings"
 
-	termcolor "github.com/aws/amazon-genomics-cli/cli/internal/pkg/term/color"
+	termcolor "github.com/aws/amazon-genomics-cli/internal/pkg/term/color"
 	"github.com/fatih/color"
 	"github.com/spf13/cobra"
 )

diff --git a/packages/cli/cmd/application/template/template.go b/packages/cli/cmd/application/template/template.go
@@ -6,7 +6,7 @@ package template
 import (
 	"fmt"
 
-	"github.com/aws/amazon-genomics-cli/cli/internal/pkg/cli/group"
+	"github.com/aws/amazon-genomics-cli/internal/pkg/cli/group"
 	"github.com/spf13/cobra"
 )
 

diff --git a/packages/go.mod → packages/cli/go.mod b/packages/go.mod → packages/cli/go.mod
@@ -39,4 +39,4 @@ require (
 	gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b
 )
 
-replace github.com/rsc/wes_client => ./wes_api/client
+replace github.com/rsc/wes_client => ./../wes_api/client
diff --git a/packages/go.sum → packages/cli/go.sum b/packages/go.sum → packages/cli/go.sum
diff --git a/packages/common/aws/batch/client.go → ...ages/cli/internal/pkg/aws/batch/client.go b/packages/common/aws/batch/client.go → ...ages/cli/internal/pkg/aws/batch/client.go
diff --git a/packages/common/aws/batch/client_test.go → ...cli/internal/pkg/aws/batch/client_test.go b/packages/common/aws/batch/client_test.go → ...cli/internal/pkg/aws/batch/client_test.go
diff --git a/packages/common/aws/batch/get_jobs.go → ...es/cli/internal/pkg/aws/batch/get_jobs.go b/packages/common/aws/batch/get_jobs.go → ...es/cli/internal/pkg/aws/batch/get_jobs.go
@@ -4,7 +4,7 @@ import (
 	"context"
 	"time"
 
-	"github.com/aws/amazon-genomics-cli/common/aws/util"
+	"github.com/aws/amazon-genomics-cli/internal/pkg/aws/util"
 	"github.com/aws/aws-sdk-go-v2/aws"
 	"github.com/aws/aws-sdk-go-v2/service/batch"
 	"github.com/aws/aws-sdk-go-v2/service/batch/types"

diff --git a/packages/common/aws/batch/get_jobs_test.go → ...i/internal/pkg/aws/batch/get_jobs_test.go b/packages/common/aws/batch/get_jobs_test.go → ...i/internal/pkg/aws/batch/get_jobs_test.go
diff --git a/packages/common/aws/batch/interface.go → ...s/cli/internal/pkg/aws/batch/interface.go b/packages/common/aws/batch/interface.go → ...s/cli/internal/pkg/aws/batch/interface.go
diff --git a/...ommon/aws/cdk/append_context_arguments.go → ...l/pkg/aws/cdk/append_context_arguments.go b/...ommon/aws/cdk/append_context_arguments.go → ...l/pkg/aws/cdk/append_context_arguments.go
diff --git a/packages/common/aws/cdk/clear_context.go → ...cli/internal/pkg/aws/cdk/clear_context.go b/packages/common/aws/cdk/clear_context.go → ...cli/internal/pkg/aws/cdk/clear_context.go
diff --git a/...ages/common/aws/cdk/clear_context_test.go → ...nternal/pkg/aws/cdk/clear_context_test.go b/...ages/common/aws/cdk/clear_context_test.go → ...nternal/pkg/aws/cdk/clear_context_test.go
diff --git a/packages/common/aws/cdk/deploy_app.go → ...es/cli/internal/pkg/aws/cdk/deploy_app.go b/packages/common/aws/cdk/deploy_app.go → ...es/cli/internal/pkg/aws/cdk/deploy_app.go
diff --git a/packages/common/aws/cdk/deploy_app_test.go → ...i/internal/pkg/aws/cdk/deploy_app_test.go b/packages/common/aws/cdk/deploy_app_test.go → ...i/internal/pkg/aws/cdk/deploy_app_test.go
@@ -3,7 +3,7 @@ package cdk
 import (
 	"testing"
 
-	iomocks "github.com/aws/amazon-genomics-cli/common/internal/pkg/mocks/io"
+	iomocks "github.com/aws/amazon-genomics-cli/internal/pkg/mocks/io"
 	"github.com/golang/mock/gomock"
 	"github.com/stretchr/testify/assert"
 )

diff --git a/packages/common/aws/cdk/destroy_app.go → ...s/cli/internal/pkg/aws/cdk/destroy_app.go b/packages/common/aws/cdk/destroy_app.go → ...s/cli/internal/pkg/aws/cdk/destroy_app.go
diff --git a/packages/common/aws/cdk/destroy_app_test.go → .../internal/pkg/aws/cdk/destroy_app_test.go b/packages/common/aws/cdk/destroy_app_test.go → .../internal/pkg/aws/cdk/destroy_app_test.go
diff --git a/packages/common/aws/cdk/execute_cdk.go → ...s/cli/internal/pkg/aws/cdk/execute_cdk.go b/packages/common/aws/cdk/execute_cdk.go → ...s/cli/internal/pkg/aws/cdk/execute_cdk.go
diff --git a/packages/common/aws/cdk/execute_cdk_test.go → .../internal/pkg/aws/cdk/execute_cdk_test.go b/packages/common/aws/cdk/execute_cdk_test.go → .../internal/pkg/aws/cdk/execute_cdk_test.go
@@ -6,7 +6,7 @@ import (
 	"os/exec"
 	"testing"
 
-	iomocks "github.com/aws/amazon-genomics-cli/common/internal/pkg/mocks/io"
+	iomocks "github.com/aws/amazon-genomics-cli/internal/pkg/mocks/io"
 	"github.com/golang/mock/gomock"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"

diff --git a/packages/common/aws/cdk/new_client.go → ...es/cli/internal/pkg/aws/cdk/new_client.go b/packages/common/aws/cdk/new_client.go → ...es/cli/internal/pkg/aws/cdk/new_client.go
diff --git a/packages/common/aws/cdk/parse_output.go → .../cli/internal/pkg/aws/cdk/parse_output.go b/packages/common/aws/cdk/parse_output.go → .../cli/internal/pkg/aws/cdk/parse_output.go
diff --git a/packages/common/aws/cdk/parse_output_test.go → ...internal/pkg/aws/cdk/parse_output_test.go b/packages/common/aws/cdk/parse_output_test.go → ...internal/pkg/aws/cdk/parse_output_test.go
diff --git a/packages/common/aws/cdk/progress.go → ...ages/cli/internal/pkg/aws/cdk/progress.go b/packages/common/aws/cdk/progress.go → ...ages/cli/internal/pkg/aws/cdk/progress.go
diff --git a/packages/common/aws/cfn/client.go → packages/cli/internal/pkg/aws/cfn/client.go b/packages/common/aws/cfn/client.go → packages/cli/internal/pkg/aws/cfn/client.go
diff --git a/packages/common/aws/cfn/client_test.go → ...s/cli/internal/pkg/aws/cfn/client_test.go b/packages/common/aws/cfn/client_test.go → ...s/cli/internal/pkg/aws/cfn/client_test.go
diff --git a/packages/common/aws/cfn/delete_stack.go → .../cli/internal/pkg/aws/cfn/delete_stack.go b/packages/common/aws/cfn/delete_stack.go → .../cli/internal/pkg/aws/cfn/delete_stack.go
diff --git a/packages/common/aws/cfn/delete_stack_test.go → ...internal/pkg/aws/cfn/delete_stack_test.go b/packages/common/aws/cfn/delete_stack_test.go → ...internal/pkg/aws/cfn/delete_stack_test.go
diff --git a/packages/common/aws/cfn/errors.go → packages/cli/internal/pkg/aws/cfn/errors.go b/packages/common/aws/cfn/errors.go → packages/cli/internal/pkg/aws/cfn/errors.go
diff --git a/packages/common/aws/cfn/get_stack_exports.go → ...internal/pkg/aws/cfn/get_stack_exports.go b/packages/common/aws/cfn/get_stack_exports.go → ...internal/pkg/aws/cfn/get_stack_exports.go
diff --git a/packages/common/aws/cfn/get_stack_info.go → ...li/internal/pkg/aws/cfn/get_stack_info.go b/packages/common/aws/cfn/get_stack_info.go → ...li/internal/pkg/aws/cfn/get_stack_info.go
diff --git a/...ges/common/aws/cfn/get_stack_info_test.go → ...ternal/pkg/aws/cfn/get_stack_info_test.go b/...ges/common/aws/cfn/get_stack_info_test.go → ...ternal/pkg/aws/cfn/get_stack_info_test.go
diff --git a/packages/common/aws/cfn/get_stack_status.go → .../internal/pkg/aws/cfn/get_stack_status.go b/packages/common/aws/cfn/get_stack_status.go → .../internal/pkg/aws/cfn/get_stack_status.go
diff --git a/packages/common/aws/cfn/get_stack_tags.go → ...li/internal/pkg/aws/cfn/get_stack_tags.go b/packages/common/aws/cfn/get_stack_tags.go → ...li/internal/pkg/aws/cfn/get_stack_tags.go
diff --git a/packages/common/aws/cfn/interface.go → ...ges/cli/internal/pkg/aws/cfn/interface.go b/packages/common/aws/cfn/interface.go → ...ges/cli/internal/pkg/aws/cfn/interface.go
diff --git a/packages/common/aws/cfn/list_stacks.go → ...s/cli/internal/pkg/aws/cfn/list_stacks.go b/packages/common/aws/cfn/list_stacks.go → ...s/cli/internal/pkg/aws/cfn/list_stacks.go
diff --git a/packages/common/aws/cfn/list_stacks_test.go → .../internal/pkg/aws/cfn/list_stacks_test.go b/packages/common/aws/cfn/list_stacks_test.go → .../internal/pkg/aws/cfn/list_stacks_test.go
diff --git a/packages/common/aws/cfn/stack_filters.go → ...cli/internal/pkg/aws/cfn/stack_filters.go b/packages/common/aws/cfn/stack_filters.go → ...cli/internal/pkg/aws/cfn/stack_filters.go
diff --git a/packages/common/aws/cwl/client.go → packages/cli/internal/pkg/aws/cwl/client.go b/packages/common/aws/cwl/client.go → packages/cli/internal/pkg/aws/cwl/client.go
diff --git a/packages/common/aws/cwl/client_test.go → ...s/cli/internal/pkg/aws/cwl/client_test.go b/packages/common/aws/cwl/client_test.go → ...s/cli/internal/pkg/aws/cwl/client_test.go
diff --git a/packages/common/aws/cwl/get_logs.go → ...ages/cli/internal/pkg/aws/cwl/get_logs.go b/packages/common/aws/cwl/get_logs.go → ...ages/cli/internal/pkg/aws/cwl/get_logs.go
@@ -5,7 +5,7 @@ import (
 	"fmt"
 	"time"
 
-	"github.com/aws/amazon-genomics-cli/common/aws/util"
+	"github.com/aws/amazon-genomics-cli/internal/pkg/aws/util"
 	"github.com/aws/aws-sdk-go-v2/aws"
 	"github.com/aws/aws-sdk-go-v2/service/cloudwatchlogs"
 	"github.com/aws/aws-sdk-go-v2/service/cloudwatchlogs/types"

diff --git a/packages/common/aws/cwl/get_logs_test.go → ...cli/internal/pkg/aws/cwl/get_logs_test.go b/packages/common/aws/cwl/get_logs_test.go → ...cli/internal/pkg/aws/cwl/get_logs_test.go
diff --git a/packages/common/aws/cwl/interface.go → ...ges/cli/internal/pkg/aws/cwl/interface.go b/packages/common/aws/cwl/interface.go → ...ges/cli/internal/pkg/aws/cwl/interface.go
diff --git a/packages/common/aws/cwl/stream_logs.go → ...s/cli/internal/pkg/aws/cwl/stream_logs.go b/packages/common/aws/cwl/stream_logs.go → ...s/cli/internal/pkg/aws/cwl/stream_logs.go
@@ -4,7 +4,7 @@ import (
 	"context"
 	"time"
 
-	"github.com/aws/amazon-genomics-cli/common/aws/util"
+	"github.com/aws/amazon-genomics-cli/internal/pkg/aws/util"
 	"github.com/aws/aws-sdk-go-v2/aws"
 	"github.com/aws/aws-sdk-go-v2/service/cloudwatchlogs"
 	"github.com/aws/aws-sdk-go-v2/service/cloudwatchlogs/types"

diff --git a/packages/common/aws/cwl/stream_logs_test.go → .../internal/pkg/aws/cwl/stream_logs_test.go b/packages/common/aws/cwl/stream_logs_test.go → .../internal/pkg/aws/cwl/stream_logs_test.go
diff --git a/packages/common/aws/ddb/client.go → packages/cli/internal/pkg/aws/ddb/client.go b/packages/common/aws/ddb/client.go → packages/cli/internal/pkg/aws/ddb/client.go
diff --git a/...on/aws/ddb/get_workflow_instance_by_id.go → ...kg/aws/ddb/get_workflow_instance_by_id.go b/...on/aws/ddb/get_workflow_instance_by_id.go → ...kg/aws/ddb/get_workflow_instance_by_id.go
diff --git a/packages/common/aws/ddb/interface.go → ...ges/cli/internal/pkg/aws/ddb/interface.go b/packages/common/aws/ddb/interface.go → ...ges/cli/internal/pkg/aws/ddb/interface.go
diff --git a/...common/aws/ddb/list_workflow_instances.go → ...al/pkg/aws/ddb/list_workflow_instances.go b/...common/aws/ddb/list_workflow_instances.go → ...al/pkg/aws/ddb/list_workflow_instances.go
diff --git a/...ddb/list_workflow_instances_by_context.go → ...ddb/list_workflow_instances_by_context.go b/...ddb/list_workflow_instances_by_context.go → ...ddb/list_workflow_instances_by_context.go
diff --git a/...ws/ddb/list_workflow_instances_by_name.go → ...ws/ddb/list_workflow_instances_by_name.go b/...ws/ddb/list_workflow_instances_by_name.go → ...ws/ddb/list_workflow_instances_by_name.go
diff --git a/packages/common/aws/ddb/list_workflows.go → ...li/internal/pkg/aws/ddb/list_workflows.go b/packages/common/aws/ddb/list_workflows.go → ...li/internal/pkg/aws/ddb/list_workflows.go
diff --git a/...common/aws/ddb/write_workflow_instance.go → ...al/pkg/aws/ddb/write_workflow_instance.go b/...common/aws/ddb/write_workflow_instance.go → ...al/pkg/aws/ddb/write_workflow_instance.go
diff --git a/packages/common/aws/ecr/Interface.go → ...ges/cli/internal/pkg/aws/ecr/Interface.go b/packages/common/aws/ecr/Interface.go → ...ges/cli/internal/pkg/aws/ecr/Interface.go
diff --git a/packages/common/aws/ecr/ecr_client.go → ...es/cli/internal/pkg/aws/ecr/ecr_client.go b/packages/common/aws/ecr/ecr_client.go → ...es/cli/internal/pkg/aws/ecr/ecr_client.go
diff --git a/packages/common/aws/ecr/ecr_client_test.go → ...i/internal/pkg/aws/ecr/ecr_client_test.go b/packages/common/aws/ecr/ecr_client_test.go → ...i/internal/pkg/aws/ecr/ecr_client_test.go
diff --git a/packages/common/aws/ecr/image_listable.go → ...li/internal/pkg/aws/ecr/image_listable.go b/packages/common/aws/ecr/image_listable.go → ...li/internal/pkg/aws/ecr/image_listable.go
diff --git a/...ges/common/aws/ecr/image_listable_test.go → ...ternal/pkg/aws/ecr/image_listable_test.go b/...ges/common/aws/ecr/image_listable_test.go → ...ternal/pkg/aws/ecr/image_listable_test.go
diff --git a/packages/common/aws/ecr/image_reference.go → ...i/internal/pkg/aws/ecr/image_reference.go b/packages/common/aws/ecr/image_reference.go → ...i/internal/pkg/aws/ecr/image_reference.go
diff --git a/...es/common/aws/ecr/image_reference_test.go → ...ernal/pkg/aws/ecr/image_reference_test.go b/...es/common/aws/ecr/image_reference_test.go → ...ernal/pkg/aws/ecr/image_reference_test.go
diff --git a/packages/common/aws/provider.go → packages/cli/internal/pkg/aws/provider.go b/packages/common/aws/provider.go → packages/cli/internal/pkg/aws/provider.go
@@ -3,15 +3,15 @@ package aws
 import (
 	"context"
 
-	"github.com/aws/amazon-genomics-cli/common/aws/batch"
-	"github.com/aws/amazon-genomics-cli/common/aws/cdk"
-	"github.com/aws/amazon-genomics-cli/common/aws/cfn"
-	"github.com/aws/amazon-genomics-cli/common/aws/cwl"
-	"github.com/aws/amazon-genomics-cli/common/aws/ddb"
-	"github.com/aws/amazon-genomics-cli/common/aws/ecr"
-	"github.com/aws/amazon-genomics-cli/common/aws/s3"
-	"github.com/aws/amazon-genomics-cli/common/aws/ssm"
-	"github.com/aws/amazon-genomics-cli/common/aws/sts"
+	"github.com/aws/amazon-genomics-cli/internal/pkg/aws/batch"
+	"github.com/aws/amazon-genomics-cli/internal/pkg/aws/cdk"
+	"github.com/aws/amazon-genomics-cli/internal/pkg/aws/cfn"
+	"github.com/aws/amazon-genomics-cli/internal/pkg/aws/cwl"
+	"github.com/aws/amazon-genomics-cli/internal/pkg/aws/ddb"
+	"github.com/aws/amazon-genomics-cli/internal/pkg/aws/ecr"
+	"github.com/aws/amazon-genomics-cli/internal/pkg/aws/s3"
+	"github.com/aws/amazon-genomics-cli/internal/pkg/aws/ssm"
+	"github.com/aws/amazon-genomics-cli/internal/pkg/aws/sts"
 	"github.com/aws/aws-sdk-go-v2/aws"
 	"github.com/aws/aws-sdk-go-v2/config"
 	"github.com/rs/zerolog/log"

diff --git a/packages/common/aws/provider_test.go → ...ges/cli/internal/pkg/aws/provider_test.go b/packages/common/aws/provider_test.go → ...ges/cli/internal/pkg/aws/provider_test.go
diff --git a/packages/common/aws/s3/bucket_exists.go → .../cli/internal/pkg/aws/s3/bucket_exists.go b/packages/common/aws/s3/bucket_exists.go → .../cli/internal/pkg/aws/s3/bucket_exists.go
diff --git a/packages/common/aws/s3/bucket_exists_test.go → ...internal/pkg/aws/s3/bucket_exists_test.go b/packages/common/aws/s3/bucket_exists_test.go → ...internal/pkg/aws/s3/bucket_exists_test.go
diff --git a/packages/common/aws/s3/client.go → packages/cli/internal/pkg/aws/s3/client.go b/packages/common/aws/s3/client.go → packages/cli/internal/pkg/aws/s3/client.go
diff --git a/packages/common/aws/s3/client_test.go → ...es/cli/internal/pkg/aws/s3/client_test.go b/packages/common/aws/s3/client_test.go → ...es/cli/internal/pkg/aws/s3/client_test.go
diff --git a/packages/common/aws/s3/interface.go → ...ages/cli/internal/pkg/aws/s3/interface.go b/packages/common/aws/s3/interface.go → ...ages/cli/internal/pkg/aws/s3/interface.go
diff --git a/packages/common/aws/s3/sync_file.go → ...ages/cli/internal/pkg/aws/s3/sync_file.go b/packages/common/aws/s3/sync_file.go → ...ages/cli/internal/pkg/aws/s3/sync_file.go
diff --git a/packages/common/aws/s3/sync_file_test.go → ...cli/internal/pkg/aws/s3/sync_file_test.go b/packages/common/aws/s3/sync_file_test.go → ...cli/internal/pkg/aws/s3/sync_file_test.go
diff --git a/packages/common/aws/s3/upload_file.go → ...es/cli/internal/pkg/aws/s3/upload_file.go b/packages/common/aws/s3/upload_file.go → ...es/cli/internal/pkg/aws/s3/upload_file.go
diff --git a/packages/common/aws/s3/util.go → packages/cli/internal/pkg/aws/s3/util.go b/packages/common/aws/s3/util.go → packages/cli/internal/pkg/aws/s3/util.go
diff --git a/packages/common/aws/s3/util_test.go → ...ages/cli/internal/pkg/aws/s3/util_test.go b/packages/common/aws/s3/util_test.go → ...ages/cli/internal/pkg/aws/s3/util_test.go
diff --git a/packages/common/aws/ssm/client.go → packages/cli/internal/pkg/aws/ssm/client.go b/packages/common/aws/ssm/client.go → packages/cli/internal/pkg/aws/ssm/client.go
diff --git a/packages/common/aws/ssm/client_test.go → ...s/cli/internal/pkg/aws/ssm/client_test.go b/packages/common/aws/ssm/client_test.go → ...s/cli/internal/pkg/aws/ssm/client_test.go
diff --git a/...es/common/aws/ssm/get_common_parameter.go → ...ernal/pkg/aws/ssm/get_common_parameter.go b/...es/common/aws/ssm/get_common_parameter.go → ...ernal/pkg/aws/ssm/get_common_parameter.go
diff --git a/...mmon/aws/ssm/get_common_parameter_test.go → .../pkg/aws/ssm/get_common_parameter_test.go b/...mmon/aws/ssm/get_common_parameter_test.go → .../pkg/aws/ssm/get_common_parameter_test.go
diff --git a/packages/common/aws/ssm/interface.go → ...ges/cli/internal/pkg/aws/ssm/interface.go b/packages/common/aws/ssm/interface.go → ...ges/cli/internal/pkg/aws/ssm/interface.go
diff --git a/packages/common/aws/sts/get_account.go → ...s/cli/internal/pkg/aws/sts/get_account.go b/packages/common/aws/sts/get_account.go → ...s/cli/internal/pkg/aws/sts/get_account.go
diff --git a/packages/common/aws/sts/get_account_test.go → .../internal/pkg/aws/sts/get_account_test.go b/packages/common/aws/sts/get_account_test.go → .../internal/pkg/aws/sts/get_account_test.go
diff --git a/packages/common/aws/sts/new_client.go → ...es/cli/internal/pkg/aws/sts/new_client.go b/packages/common/aws/sts/new_client.go → ...es/cli/internal/pkg/aws/sts/new_client.go
diff --git a/packages/common/aws/sts/new_client_test.go → ...i/internal/pkg/aws/sts/new_client_test.go b/packages/common/aws/sts/new_client_test.go → ...i/internal/pkg/aws/sts/new_client_test.go
diff --git a/packages/common/aws/util/time.go → packages/cli/internal/pkg/aws/util/time.go b/packages/common/aws/util/time.go → packages/cli/internal/pkg/aws/util/time.go
diff --git a/packages/common/aws/util/time_test.go → ...es/cli/internal/pkg/aws/util/time_test.go b/packages/common/aws/util/time_test.go → ...es/cli/internal/pkg/aws/util/time_test.go
diff --git a/packages/cli/internal/pkg/cli/account.go b/packages/cli/internal/pkg/cli/account.go
@@ -4,8 +4,8 @@
 package cli
 
 import (
-	"github.com/aws/amazon-genomics-cli/cli/cmd/application/template"
-	"github.com/aws/amazon-genomics-cli/cli/internal/pkg/cli/group"
+	"github.com/aws/amazon-genomics-cli/cmd/application/template"
+	"github.com/aws/amazon-genomics-cli/internal/pkg/cli/group"
 	"github.com/spf13/cobra"
 )
 

diff --git a/packages/cli/internal/pkg/cli/account_activate.go b/packages/cli/internal/pkg/cli/account_activate.go
@@ -7,14 +7,14 @@ import (
 	"fmt"
 	"path/filepath"
 
-	"github.com/aws/amazon-genomics-cli/cli/environment"
-	"github.com/aws/amazon-genomics-cli/cli/internal/pkg/cli/clierror"
-	"github.com/aws/amazon-genomics-cli/common/aws"
-	"github.com/aws/amazon-genomics-cli/common/aws/cdk"
-	"github.com/aws/amazon-genomics-cli/common/aws/ecr"
-	"github.com/aws/amazon-genomics-cli/common/aws/s3"
-	"github.com/aws/amazon-genomics-cli/common/aws/sts"
-	"github.com/aws/amazon-genomics-cli/common/logging"
+	"github.com/aws/amazon-genomics-cli/internal/pkg/aws"
+	"github.com/aws/amazon-genomics-cli/internal/pkg/aws/cdk"
+	"github.com/aws/amazon-genomics-cli/internal/pkg/aws/ecr"
+	"github.com/aws/amazon-genomics-cli/internal/pkg/aws/s3"
+	"github.com/aws/amazon-genomics-cli/internal/pkg/aws/sts"
+	"github.com/aws/amazon-genomics-cli/internal/pkg/cli/clierror"
+	"github.com/aws/amazon-genomics-cli/internal/pkg/environment"
+	"github.com/aws/amazon-genomics-cli/internal/pkg/logging"
 	"github.com/rs/zerolog/log"
 	"github.com/spf13/cobra"
 )

diff --git a/packages/cli/internal/pkg/cli/account_activate_test.go b/packages/cli/internal/pkg/cli/account_activate_test.go
@@ -5,8 +5,8 @@ import (
 	"os"
 	"testing"
 
-	"github.com/aws/amazon-genomics-cli/common/aws/ecr"
-	"github.com/aws/amazon-genomics-cli/common/logging"
+	"github.com/aws/amazon-genomics-cli/internal/pkg/aws/ecr"
+	"github.com/aws/amazon-genomics-cli/internal/pkg/logging"
 	"github.com/golang/mock/gomock"
 	"github.com/stretchr/testify/assert"
 )

diff --git a/packages/cli/internal/pkg/cli/account_deactivate.go b/packages/cli/internal/pkg/cli/account_deactivate.go
@@ -8,9 +8,9 @@ import (
 	"fmt"
 	"regexp"
 
-	"github.com/aws/amazon-genomics-cli/cli/internal/pkg/cli/clierror"
-	"github.com/aws/amazon-genomics-cli/common/aws"
-	"github.com/aws/amazon-genomics-cli/common/aws/cfn"
+	"github.com/aws/amazon-genomics-cli/internal/pkg/aws"
+	"github.com/aws/amazon-genomics-cli/internal/pkg/aws/cfn"
+	"github.com/aws/amazon-genomics-cli/internal/pkg/cli/clierror"
 	"github.com/rs/zerolog/log"
 	"github.com/spf13/cobra"
 )

diff --git a/packages/cli/internal/pkg/cli/account_deactivate_test.go b/packages/cli/internal/pkg/cli/account_deactivate_test.go
@@ -5,7 +5,7 @@ import (
 	"regexp"
 	"testing"
 
-	"github.com/aws/amazon-genomics-cli/common/aws/cfn"
+	"github.com/aws/amazon-genomics-cli/internal/pkg/aws/cfn"
 	"github.com/stretchr/testify/assert"
 )
 

diff --git a/packages/cli/internal/pkg/cli/awsresources/awsresources.go b/packages/cli/internal/pkg/cli/awsresources/awsresources.go
@@ -4,7 +4,7 @@ import (
 	"fmt"
 	"path"
 
-	"github.com/aws/amazon-genomics-cli/cli/internal/pkg/constants"
+	"github.com/aws/amazon-genomics-cli/internal/pkg/constants"
 )
 
 func RenderContextStackName(projectName, contextName, userId string) string {

diff --git a/packages/cli/internal/pkg/cli/cli_test.go b/packages/cli/internal/pkg/cli/cli_test.go
@@ -3,9 +3,9 @@ package cli
 import (
 	"testing"
 
-	awsmocks "github.com/aws/amazon-genomics-cli/cli/internal/pkg/mocks/aws"
-	storagemocks "github.com/aws/amazon-genomics-cli/cli/internal/pkg/mocks/storage"
-	"github.com/aws/amazon-genomics-cli/common/aws/cdk"
+	"github.com/aws/amazon-genomics-cli/internal/pkg/aws/cdk"
+	awsmocks "github.com/aws/amazon-genomics-cli/internal/pkg/mocks/aws"
+	storagemocks "github.com/aws/amazon-genomics-cli/internal/pkg/mocks/storage"
 	"github.com/golang/mock/gomock"
 	"github.com/stretchr/testify/assert"
 )

diff --git a/packages/cli/internal/pkg/cli/config/config_test.go b/packages/cli/internal/pkg/cli/config/config_test.go
@@ -4,7 +4,7 @@ import (
 	"io/fs"
 	"testing"
 
-	iomocks "github.com/aws/amazon-genomics-cli/cli/internal/pkg/mocks/io"
+	iomocks "github.com/aws/amazon-genomics-cli/internal/pkg/mocks/io"
 	"github.com/golang/mock/gomock"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"

diff --git a/packages/cli/internal/pkg/cli/configure.go b/packages/cli/internal/pkg/cli/configure.go
@@ -4,8 +4,8 @@
 package cli
 
 import (
-	"github.com/aws/amazon-genomics-cli/cli/cmd/application/template"
-	"github.com/aws/amazon-genomics-cli/cli/internal/pkg/cli/group"
+	"github.com/aws/amazon-genomics-cli/cmd/application/template"
+	"github.com/aws/amazon-genomics-cli/internal/pkg/cli/group"
 	"github.com/spf13/cobra"
 )
 

diff --git a/packages/cli/internal/pkg/cli/configure_describe.go b/packages/cli/internal/pkg/cli/configure_describe.go
@@ -4,10 +4,10 @@
 package cli
 
 import (
-	"github.com/aws/amazon-genomics-cli/cli/internal/pkg/cli/clierror"
-	"github.com/aws/amazon-genomics-cli/cli/internal/pkg/cli/config"
-	"github.com/aws/amazon-genomics-cli/cli/internal/pkg/cli/format"
-	"github.com/aws/amazon-genomics-cli/cli/internal/pkg/storage"
+	"github.com/aws/amazon-genomics-cli/internal/pkg/cli/clierror"
+	"github.com/aws/amazon-genomics-cli/internal/pkg/cli/config"
+	"github.com/aws/amazon-genomics-cli/internal/pkg/cli/format"
+	"github.com/aws/amazon-genomics-cli/internal/pkg/storage"
 	"github.com/rs/zerolog/log"
 	"github.com/spf13/cobra"
 )

diff --git a/packages/cli/internal/pkg/cli/configure_describe_test.go b/packages/cli/internal/pkg/cli/configure_describe_test.go
@@ -7,7 +7,7 @@ import (
 	"reflect"
 	"testing"
 
-	"github.com/aws/amazon-genomics-cli/cli/internal/pkg/cli/config"
+	"github.com/aws/amazon-genomics-cli/internal/pkg/cli/config"
 	"github.com/stretchr/testify/require"
 )
 

diff --git a/packages/cli/internal/pkg/cli/configure_email.go b/packages/cli/internal/pkg/cli/configure_email.go
@@ -6,9 +6,9 @@ package cli
 import (
 	"net/mail"
 
-	"github.com/aws/amazon-genomics-cli/cli/internal/pkg/cli/clierror"
-	"github.com/aws/amazon-genomics-cli/cli/internal/pkg/cli/config"
-	"github.com/aws/amazon-genomics-cli/cli/internal/pkg/storage"
+	"github.com/aws/amazon-genomics-cli/internal/pkg/cli/clierror"
+	"github.com/aws/amazon-genomics-cli/internal/pkg/cli/config"
+	"github.com/aws/amazon-genomics-cli/internal/pkg/storage"
 	"github.com/rs/zerolog/log"
 	"github.com/spf13/cobra"
 )

diff --git a/packages/cli/internal/pkg/cli/context.go b/packages/cli/internal/pkg/cli/context.go
@@ -4,8 +4,8 @@
 package cli
 
 import (
-	"github.com/aws/amazon-genomics-cli/cli/cmd/application/template"
-	"github.com/aws/amazon-genomics-cli/cli/internal/pkg/cli/group"
+	"github.com/aws/amazon-genomics-cli/cmd/application/template"
+	"github.com/aws/amazon-genomics-cli/internal/pkg/cli/group"
 	"github.com/spf13/cobra"
 )
 

diff --git a/packages/cli/internal/pkg/cli/context/common_test.go b/packages/cli/internal/pkg/cli/context/common_test.go
@@ -3,10 +3,10 @@ package context
 import (
 	"testing"
 
-	"github.com/aws/amazon-genomics-cli/cli/internal/pkg/cli/spec"
-	awsmocks "github.com/aws/amazon-genomics-cli/cli/internal/pkg/mocks/aws"
-	storagemocks "github.com/aws/amazon-genomics-cli/cli/internal/pkg/mocks/storage"
-	"github.com/aws/amazon-genomics-cli/common/aws/cdk"
+	"github.com/aws/amazon-genomics-cli/internal/pkg/aws/cdk"
+	"github.com/aws/amazon-genomics-cli/internal/pkg/cli/spec"
+	awsmocks "github.com/aws/amazon-genomics-cli/internal/pkg/mocks/aws"
+	storagemocks "github.com/aws/amazon-genomics-cli/internal/pkg/mocks/storage"
 	"github.com/golang/mock/gomock"
 )
 

diff --git a/packages/cli/internal/pkg/cli/context/manager.go b/packages/cli/internal/pkg/cli/context/manager.go
@@ -6,14 +6,14 @@ import (
 	"os"
 	"strings"
 
-	"github.com/aws/amazon-genomics-cli/cli/internal/pkg/cli/config"
-	"github.com/aws/amazon-genomics-cli/cli/internal/pkg/cli/spec"
-	"github.com/aws/amazon-genomics-cli/cli/internal/pkg/storage"
-	"github.com/aws/amazon-genomics-cli/common/aws"
-	"github.com/aws/amazon-genomics-cli/common/aws/cdk"
-	"github.com/aws/amazon-genomics-cli/common/aws/cfn"
-	"github.com/aws/amazon-genomics-cli/common/aws/s3"
-	"github.com/aws/amazon-genomics-cli/common/aws/ssm"
+	"github.com/aws/amazon-genomics-cli/internal/pkg/aws"
+	"github.com/aws/amazon-genomics-cli/internal/pkg/aws/cdk"
+	"github.com/aws/amazon-genomics-cli/internal/pkg/aws/cfn"
+	"github.com/aws/amazon-genomics-cli/internal/pkg/aws/s3"
+	"github.com/aws/amazon-genomics-cli/internal/pkg/aws/ssm"
+	"github.com/aws/amazon-genomics-cli/internal/pkg/cli/config"
+	"github.com/aws/amazon-genomics-cli/internal/pkg/cli/spec"
+	"github.com/aws/amazon-genomics-cli/internal/pkg/storage"
 	"github.com/rs/zerolog/log"
 )
 

diff --git a/packages/cli/internal/pkg/cli/context/manager_deploy.go b/packages/cli/internal/pkg/cli/context/manager_deploy.go
@@ -4,8 +4,8 @@ import (
 	"fmt"
 	"path/filepath"
 
-	"github.com/aws/amazon-genomics-cli/common/aws/cdk"
-	"github.com/aws/amazon-genomics-cli/common/logging"
+	"github.com/aws/amazon-genomics-cli/internal/pkg/aws/cdk"
+	"github.com/aws/amazon-genomics-cli/internal/pkg/logging"
 	"github.com/rs/zerolog/log"
 )
 

diff --git a/packages/cli/internal/pkg/cli/context/manager_deploy_test.go b/packages/cli/internal/pkg/cli/context/manager_deploy_test.go
@@ -5,8 +5,8 @@ import (
 	"path/filepath"
 	"testing"
 
-	"github.com/aws/amazon-genomics-cli/cli/internal/pkg/cli/spec"
-	"github.com/aws/amazon-genomics-cli/common/logging"
+	"github.com/aws/amazon-genomics-cli/internal/pkg/cli/spec"
+	"github.com/aws/amazon-genomics-cli/internal/pkg/logging"
 	"github.com/golang/mock/gomock"
 	"github.com/stretchr/testify/assert"
 )

diff --git a/packages/cli/internal/pkg/cli/context/manager_destroy.go b/packages/cli/internal/pkg/cli/context/manager_destroy.go
@@ -4,7 +4,7 @@ import (
 	"fmt"
 	"path/filepath"
 
-	"github.com/aws/amazon-genomics-cli/common/aws/cdk"
+	"github.com/aws/amazon-genomics-cli/internal/pkg/aws/cdk"
 )
 
 const (

diff --git a/packages/cli/internal/pkg/cli/context/manager_destroy_test.go b/packages/cli/internal/pkg/cli/context/manager_destroy_test.go
@@ -5,7 +5,7 @@ import (
 	"path/filepath"
 	"testing"
 
-	"github.com/aws/amazon-genomics-cli/cli/internal/pkg/cli/spec"
+	"github.com/aws/amazon-genomics-cli/internal/pkg/cli/spec"
 	"github.com/golang/mock/gomock"
 	"github.com/stretchr/testify/assert"
 )

diff --git a/packages/cli/internal/pkg/cli/context/manager_info.go b/packages/cli/internal/pkg/cli/context/manager_info.go
@@ -3,9 +3,9 @@ package context
 import (
 	"errors"
 
-	"github.com/aws/amazon-genomics-cli/cli/internal/pkg/cli/awsresources"
-	"github.com/aws/amazon-genomics-cli/common/aws/cfn"
-	"github.com/aws/amazon-genomics-cli/common/aws/s3"
+	"github.com/aws/amazon-genomics-cli/internal/pkg/aws/cfn"
+	"github.com/aws/amazon-genomics-cli/internal/pkg/aws/s3"
+	"github.com/aws/amazon-genomics-cli/internal/pkg/cli/awsresources"
 )
 
 func (m *Manager) Info(contextName string) (Detail, error) {

diff --git a/packages/cli/internal/pkg/cli/context/manager_info_test.go b/packages/cli/internal/pkg/cli/context/manager_info_test.go
@@ -4,8 +4,8 @@ import (
 	"fmt"
 	"testing"
 
-	"github.com/aws/amazon-genomics-cli/cli/internal/pkg/cli/spec"
-	"github.com/aws/amazon-genomics-cli/common/aws/cfn"
+	"github.com/aws/amazon-genomics-cli/internal/pkg/aws/cfn"
+	"github.com/aws/amazon-genomics-cli/internal/pkg/cli/spec"
 	"github.com/aws/aws-sdk-go-v2/service/cloudformation/types"
 	"github.com/stretchr/testify/assert"
 )

diff --git a/packages/cli/internal/pkg/cli/context/manager_list_test.go b/packages/cli/internal/pkg/cli/context/manager_list_test.go
@@ -4,7 +4,7 @@ import (
 	"fmt"
 	"testing"
 
-	"github.com/aws/amazon-genomics-cli/cli/internal/pkg/cli/spec"
+	"github.com/aws/amazon-genomics-cli/internal/pkg/cli/spec"
 	"github.com/stretchr/testify/assert"
 )
-Original file line number
+Diff line change
@@ Expand Up / @@ -4,7 +4,7 @@ import ( @@
     	"fmt"
     	"path"
-    	"github.com/aws/amazon-genomics-cli/cli/internal/pkg/constants"
+    	"github.com/aws/amazon-genomics-cli/internal/pkg/constants"
     )
     func RenderContextStackName(projectName, contextName, userId string) string {
@@ Expand Down @@