Clean up after merging the tfmigrate-storage repository

minamijoyo · Aug 15, 2023 · ab0e6b7 · ab0e6b7
1 parent e54607c
commit ab0e6b7
Show file tree

Hide file tree

Showing 31 changed files with 34 additions and 873 deletions.
diff --git a/command/history_runner_test.go b/command/history_runner_test.go
@@ -6,9 +6,9 @@ import (
 
 	"github.com/google/go-cmp/cmp"
 	"github.com/google/go-cmp/cmp/cmpopts"
-	"github.com/minamijoyo/tfmigrate-storage/mock"
 	"github.com/minamijoyo/tfmigrate/config"
 	"github.com/minamijoyo/tfmigrate/history"
+	"github.com/minamijoyo/tfmigrate/storage/mock"
 )
 
 func TestHistoryRunnerPlan(t *testing.T) {

diff --git a/command/list_test.go b/command/list_test.go
@@ -4,9 +4,9 @@ import (
 	"context"
 	"testing"
 
-	"github.com/minamijoyo/tfmigrate-storage/mock"
 	"github.com/minamijoyo/tfmigrate/config"
 	"github.com/minamijoyo/tfmigrate/history"
+	"github.com/minamijoyo/tfmigrate/storage/mock"
 )
 
 func TestListMigrations(t *testing.T) {

diff --git a/config/history_test.go b/config/history_test.go
@@ -4,8 +4,8 @@ import (
 	"reflect"
 	"testing"
 
-	"github.com/minamijoyo/tfmigrate-storage/local"
 	"github.com/minamijoyo/tfmigrate/history"
+	"github.com/minamijoyo/tfmigrate/storage/local"
 )
 
 func TestParseHistoryBlock(t *testing.T) {

diff --git a/config/storage.go b/config/storage.go
@@ -5,11 +5,11 @@ import (
 
 	"github.com/hashicorp/hcl/v2"
 	"github.com/hashicorp/hcl/v2/gohcl"
-	storage "github.com/minamijoyo/tfmigrate-storage"
-	"github.com/minamijoyo/tfmigrate-storage/gcs"
-	"github.com/minamijoyo/tfmigrate-storage/local"
-	"github.com/minamijoyo/tfmigrate-storage/mock"
-	"github.com/minamijoyo/tfmigrate-storage/s3"
+	"github.com/minamijoyo/tfmigrate/storage"
+	"github.com/minamijoyo/tfmigrate/storage/gcs"
+	"github.com/minamijoyo/tfmigrate/storage/local"
+	"github.com/minamijoyo/tfmigrate/storage/mock"
+	"github.com/minamijoyo/tfmigrate/storage/s3"
 )
 
 // StorageBlock represents a block for migration history data store in HCL.

diff --git a/config/storage_gcs_test.go b/config/storage_gcs_test.go
@@ -4,8 +4,8 @@ import (
 	"reflect"
 	"testing"
 
-	storage "github.com/minamijoyo/tfmigrate-storage"
-	"github.com/minamijoyo/tfmigrate-storage/gcs"
+	"github.com/minamijoyo/tfmigrate/storage"
+	"github.com/minamijoyo/tfmigrate/storage/gcs"
 )
 
 func TestParseGCSStorageBlock(t *testing.T) {

diff --git a/config/storage_local_test.go b/config/storage_local_test.go
@@ -4,8 +4,8 @@ import (
 	"reflect"
 	"testing"
 
-	storage "github.com/minamijoyo/tfmigrate-storage"
-	"github.com/minamijoyo/tfmigrate-storage/local"
+	"github.com/minamijoyo/tfmigrate/storage"
+	"github.com/minamijoyo/tfmigrate/storage/local"
 )
 
 func TestParseLocalStorageBlock(t *testing.T) {

diff --git a/config/storage_mock_test.go b/config/storage_mock_test.go
@@ -4,8 +4,8 @@ import (
 	"reflect"
 	"testing"
 
-	storage "github.com/minamijoyo/tfmigrate-storage"
-	"github.com/minamijoyo/tfmigrate-storage/mock"
+	"github.com/minamijoyo/tfmigrate/storage"
+	"github.com/minamijoyo/tfmigrate/storage/mock"
 )
 
 func TestParseMockStorageBlock(t *testing.T) {

diff --git a/config/storage_s3_test.go b/config/storage_s3_test.go
@@ -4,8 +4,8 @@ import (
 	"reflect"
 	"testing"
 
-	storage "github.com/minamijoyo/tfmigrate-storage"
-	"github.com/minamijoyo/tfmigrate-storage/s3"
+	"github.com/minamijoyo/tfmigrate/storage"
+	"github.com/minamijoyo/tfmigrate/storage/s3"
 )
 
 func TestParseS3StorageBlock(t *testing.T) {

diff --git a/config/storage_test.go b/config/storage_test.go
@@ -4,8 +4,8 @@ import (
 	"reflect"
 	"testing"
 
-	storage "github.com/minamijoyo/tfmigrate-storage"
-	"github.com/minamijoyo/tfmigrate-storage/local"
+	"github.com/minamijoyo/tfmigrate/storage"
+	"github.com/minamijoyo/tfmigrate/storage/local"
 )
 
 func TestParseStorageBlock(t *testing.T) {

diff --git a/config/tfmigrate_test.go b/config/tfmigrate_test.go
@@ -4,8 +4,8 @@ import (
 	"reflect"
 	"testing"
 
-	"github.com/minamijoyo/tfmigrate-storage/local"
 	"github.com/minamijoyo/tfmigrate/history"
+	"github.com/minamijoyo/tfmigrate/storage/local"
 )
 
 func TestParseConfigurationFile(t *testing.T) {

diff --git a/go.mod b/go.mod
@@ -3,13 +3,15 @@ module github.com/minamijoyo/tfmigrate
 go 1.20
 
 require (
+	cloud.google.com/go/storage v1.25.0
+	github.com/aws/aws-sdk-go v1.43.22
 	github.com/davecgh/go-spew v1.1.1
 	github.com/google/go-cmp v0.5.8
+	github.com/hashicorp/aws-sdk-go-base v1.1.0
 	github.com/hashicorp/go-version v1.3.0
 	github.com/hashicorp/hcl/v2 v2.6.0
 	github.com/hashicorp/logutils v1.0.0
 	github.com/mattn/go-shellwords v1.0.10
-	github.com/minamijoyo/tfmigrate-storage v0.0.0-20220824073652-6dd8f2fd2948
 	github.com/mitchellh/cli v1.1.1
 	github.com/spf13/pflag v1.0.2
 )
@@ -18,20 +20,17 @@ require (
 	cloud.google.com/go v0.102.1 // indirect
 	cloud.google.com/go/compute v1.7.0 // indirect
 	cloud.google.com/go/iam v0.3.0 // indirect
-	cloud.google.com/go/storage v1.25.0 // indirect
 	github.com/agext/levenshtein v1.2.1 // indirect
 	github.com/apparentlymart/go-textseg v1.0.0 // indirect
 	github.com/apparentlymart/go-textseg/v12 v12.0.0 // indirect
 	github.com/armon/go-radix v0.0.0-20180808171621-7fddfc383310 // indirect
-	github.com/aws/aws-sdk-go v1.43.22 // indirect
 	github.com/bgentry/speakeasy v0.1.0 // indirect
 	github.com/fatih/color v1.7.0 // indirect
 	github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e // indirect
 	github.com/golang/protobuf v1.5.2 // indirect
 	github.com/google/uuid v1.3.0 // indirect
 	github.com/googleapis/enterprise-certificate-proxy v0.1.0 // indirect
 	github.com/googleapis/gax-go/v2 v2.4.0 // indirect
-	github.com/hashicorp/aws-sdk-go-base v1.1.0 // indirect
 	github.com/hashicorp/errwrap v1.0.0 // indirect
 	github.com/hashicorp/go-cleanhttp v0.5.0 // indirect
 	github.com/hashicorp/go-multierror v1.0.0 // indirect

diff --git a/go.sum b/go.sum
@@ -243,8 +243,6 @@ github.com/mattn/go-isatty v0.0.3 h1:ns/ykhmWi7G9O+8a448SecJU3nSMBXJfqQkl0upE1jI
 github.com/mattn/go-isatty v0.0.3/go.mod h1:M+lRXTBqGeGNdLjl/ufCoiOlB5xdOkqRJdNxMWT7Zi4=
 github.com/mattn/go-shellwords v1.0.10 h1:Y7Xqm8piKOO3v10Thp7Z36h4FYFjt5xB//6XvOrs2Gw=
 github.com/mattn/go-shellwords v1.0.10/go.mod h1:EZzvwXDESEeg03EKmM+RmDnNOPKG4lLtQsUlTZDWQ8Y=
-github.com/minamijoyo/tfmigrate-storage v0.0.0-20220824073652-6dd8f2fd2948 h1:vlF4RA/gCl0PrcLb+eLSzwrXCJnOyXzSUy+rcukpi9c=
-github.com/minamijoyo/tfmigrate-storage v0.0.0-20220824073652-6dd8f2fd2948/go.mod h1:xuoRsfW0G2VKzfGkc7vt4MCWmxZLAWyHbBax4JK9Sqg=
 github.com/mitchellh/cli v1.1.1 h1:J64v/xD7Clql+JVKSvkYojLOXu1ibnY9ZjGLwSt/89w=
 github.com/mitchellh/cli v1.1.1/go.mod h1:xcISNoH86gajksDmfB23e/pu+B+GeFRMYmoHXxx3xhI=
 github.com/mitchellh/go-homedir v1.1.0 h1:lukF9ziXFxDFPkA1vsr5zpc1XuPDn/wFntq5mG+4E0Y=

diff --git a/history/config.go b/history/config.go
@@ -1,7 +1,7 @@
 package history
 
 import (
-	storage "github.com/minamijoyo/tfmigrate-storage"
+	"github.com/minamijoyo/tfmigrate/storage"
 )
 
 // Config is a set of configurations for migration history management.

diff --git a/history/controller.go b/history/controller.go
@@ -9,7 +9,7 @@ import (
 	"strings"
 	"time"
 
-	storage "github.com/minamijoyo/tfmigrate-storage"
+	"github.com/minamijoyo/tfmigrate/storage"
 )
 
 // Controller manages a migration history.

diff --git a/history/controller_test.go b/history/controller_test.go
@@ -9,8 +9,8 @@ import (
 	"time"
 
 	"github.com/google/go-cmp/cmp"
-	storage "github.com/minamijoyo/tfmigrate-storage"
-	"github.com/minamijoyo/tfmigrate-storage/mock"
+	"github.com/minamijoyo/tfmigrate/storage"
+	"github.com/minamijoyo/tfmigrate/storage/mock"
 )
 
 func TestLoadMigrationFileNames(t *testing.T) {

diff --git a/storage/.github/workflows/lint.yaml b/storage/.github/workflows/lint.yaml
diff --git a/storage/.github/workflows/test.yaml b/storage/.github/workflows/test.yaml
diff --git a/storage/.golangci.yml b/storage/.golangci.yml
diff --git a/storage/LICENSE b/storage/LICENSE
diff --git a/storage/Makefile b/storage/Makefile
diff --git a/storage/README.md b/storage/README.md
diff --git a/storage/gcs/config.go b/storage/gcs/config.go
@@ -1,6 +1,6 @@
 package gcs
 
-import storage "github.com/minamijoyo/tfmigrate-storage"
+import "github.com/minamijoyo/tfmigrate/storage"
 
 // Config is a config for Google Cloud Storage.
 // This is expected to have almost the same options as Terraform gcs backend.

diff --git a/storage/gcs/storage.go b/storage/gcs/storage.go
@@ -4,7 +4,7 @@ import (
 	"context"
 
 	gcStorage "cloud.google.com/go/storage"
-	storage "github.com/minamijoyo/tfmigrate-storage"
+	"github.com/minamijoyo/tfmigrate/storage"
 )
 
 // An implementation of [storage.Storage] interface.

diff --git a/storage/go.mod b/storage/go.mod