Restructured source files to make sense (#2)

jchionh · murphm8 · commit a8750219dd3f · 2019-04-05T14:05:06.000-07:00
Have the moved files show up in /pkg directory
diff --git a/.gitignore b/.gitignore
@@ -1,7 +1,6 @@
 /eclipse-bin/
 /bin
 /build
-/pkg
 .classpath
 .project
 .settings
@@ -28,4 +27,4 @@ modules.xml
 
 assets
 
-# End of https://www.gitignore.io/api/jetbrains+all
+# End of https://www.gitignore.io/api/jetbrains+all
diff --git a/example/s3_download/main.go b/example/s3_download/main.go
@@ -5,13 +5,13 @@ package main
 
 import (
 	"fmt"
+	"github.com/aws-robotics/aws-robomaker-bundle-support-library/pkg/s3"
 	"io"
 	"os"
 
 	"github.com/aws/aws-sdk-go/aws"
 	"github.com/aws/aws-sdk-go/aws/session"
 	awsS3 "github.com/aws/aws-sdk-go/service/s3"
-	"go.amzn.com/robomaker/bundle_support/s3"
 )
 
 const (
diff --git a/example/test_app/main.go b/example/test_app/main.go
@@ -5,11 +5,10 @@ package main
 
 import (
 	"fmt"
+	"github.com/aws-robotics/aws-robomaker-bundle-support-library/pkg/bundle"
+	"github.com/aws-robotics/aws-robomaker-bundle-support-library/pkg/file_system"
+	"github.com/aws-robotics/aws-robomaker-bundle-support-library/pkg/store"
 	"time"
-
-	"go.amzn.com/robomaker/bundle_support"
-	"go.amzn.com/robomaker/bundle_support/file_system"
-	"go.amzn.com/robomaker/bundle_support/store"
 )
 
 const (
@@ -27,7 +26,7 @@ func main() {
 	localFileSystem := file_system.NewLocalFS()
 	bundleStore := store.NewSimpleStore(BundleStoreRootLocation, localFileSystem)
 
-	bundleProvider := bundle_support.NewBundleProvider(bundleStore)
+	bundleProvider := bundle.NewBundleProvider(bundleStore)
 	bundleProvider.SetProgressCallback(printProgress)
 
 	// Start measuring the time it takes to extract
diff --git a/pkg/3p/archiver/NOTICE b/pkg/3p/archiver/NOTICE
diff --git a/pkg/3p/archiver/archiver.go b/pkg/3p/archiver/archiver.go
diff --git a/pkg/3p/archiver/tar.go b/pkg/3p/archiver/tar.go
diff --git a/pkg/3p/archiver/targz.go b/pkg/3p/archiver/targz.go
diff --git a/pkg/archive/bundle_archive.go b/pkg/archive/bundle_archive.go
@@ -7,9 +7,9 @@ import (
 	"archive/tar"
 	"errors"
 	"fmt"
-	"go.amzn.com/robomaker/bundle_support/bundle"
-	"go.amzn.com/robomaker/bundle_support/extractors"
-	"go.amzn.com/robomaker/bundle_support/store"
+	"github.com/aws-robotics/aws-robomaker-bundle-support-library/pkg/bundle"
+	"github.com/aws-robotics/aws-robomaker-bundle-support-library/pkg/extractors"
+	"github.com/aws-robotics/aws-robomaker-bundle-support-library/pkg/store"
 	"io"
 )
 
diff --git a/pkg/archive/bundle_processor.go b/pkg/archive/bundle_processor.go
@@ -4,8 +4,8 @@
 package archive
 
 import (
-	"go.amzn.com/robomaker/bundle_support/bundle"
-	"go.amzn.com/robomaker/bundle_support/store"
+	"github.com/aws-robotics/aws-robomaker-bundle-support-library/pkg/bundle"
+	"github.com/aws-robotics/aws-robomaker-bundle-support-library/pkg/store"
 	"io"
 )
 
diff --git a/pkg/archive/bundle_processor_test.go b/pkg/archive/bundle_processor_test.go
diff --git a/pkg/archive/bundle_processor_v1.go b/pkg/archive/bundle_processor_v1.go
@@ -4,10 +4,10 @@
 package archive
 
 import (
+	"github.com/aws-robotics/aws-robomaker-bundle-support-library/pkg/bundle"
+	"github.com/aws-robotics/aws-robomaker-bundle-support-library/pkg/extractors"
+	"github.com/aws-robotics/aws-robomaker-bundle-support-library/pkg/store"
 	"github.com/google/uuid"
-	"go.amzn.com/robomaker/bundle_support/bundle"
-	"go.amzn.com/robomaker/bundle_support/extractors"
-	"go.amzn.com/robomaker/bundle_support/store"
 	"io"
 )
 
diff --git a/pkg/archive/bundle_processor_v1_test.go b/pkg/archive/bundle_processor_v1_test.go
@@ -5,10 +5,11 @@ package archive
 
 import (
 	"fmt"
+	"github.com/aws-robotics/aws-robomaker-bundle-support-library/pkg/extractors"
+	"github.com/aws-robotics/aws-robomaker-bundle-support-library/pkg/store"
 	"github.com/golang/mock/gomock"
 	"github.com/stretchr/testify/assert"
-	"go.amzn.com/robomaker/bundle_support/extractors"
-	"go.amzn.com/robomaker/bundle_support/store"
+
 	"testing"
 )
 
diff --git a/pkg/archive/bundle_processor_v2.go b/pkg/archive/bundle_processor_v2.go
@@ -8,9 +8,9 @@ import (
 	"compress/gzip"
 	"encoding/json"
 	"fmt"
-	"go.amzn.com/robomaker/bundle_support/bundle"
-	"go.amzn.com/robomaker/bundle_support/extractors"
-	"go.amzn.com/robomaker/bundle_support/store"
+	"github.com/aws-robotics/aws-robomaker-bundle-support-library/pkg/bundle"
+	"github.com/aws-robotics/aws-robomaker-bundle-support-library/pkg/extractors"
+	"github.com/aws-robotics/aws-robomaker-bundle-support-library/pkg/store"
 	"io"
 	"io/ioutil"
 )
diff --git a/pkg/archive/overlay.go b/pkg/archive/overlay.go
diff --git a/pkg/bundle/bundle.go b/pkg/bundle/bundle.go
@@ -7,7 +7,7 @@ package bundle
 
 import (
 	"fmt"
-	"go.amzn.com/robomaker/bundle_support/store"
+	"github.com/aws-robotics/aws-robomaker-bundle-support-library/pkg/store"
 	"path/filepath"
 )
 
diff --git a/pkg/bundle/bundle_error.go b/pkg/bundle/bundle_error.go
@@ -1,7 +1,7 @@
 // Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
 // SPDX-License-Identifier: Apache-2.0
 
-package bundle_support
+package bundle
 
 import "fmt"
 
diff --git a/pkg/bundle/bundle_provider.go b/pkg/bundle/bundle_provider.go
@@ -1,21 +1,19 @@
 // Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
 // SPDX-License-Identifier: Apache-2.0
 
-package bundle_support
+package bundle
 
 //go:generate $MOCKGEN -destination=mock_bundle_manager.go -package=bundle_support go.amzn.com/robomaker/bundle_support BundleProvider
 
 import (
 	"fmt"
+	"github.com/aws-robotics/aws-robomaker-bundle-support-library/pkg/archive"
+	"github.com/aws-robotics/aws-robomaker-bundle-support-library/pkg/store"
+	"github.com/aws-robotics/aws-robomaker-bundle-support-library/pkg/stream"
 	"io"
 	"time"
 
 	"github.com/aws/aws-sdk-go/service/s3/s3iface"
-
-	"go.amzn.com/robomaker/bundle_support/archive"
-	"go.amzn.com/robomaker/bundle_support/bundle"
-	"go.amzn.com/robomaker/bundle_support/store"
-	"go.amzn.com/robomaker/bundle_support/stream"
 )
 
 /*
@@ -27,12 +25,12 @@ It does this by:
 */
 type BundleProvider interface {
 	// With the URL to the bundle, extract bundle files to the cache, and return a useable Bundle
-	GetBundle(url string) (bundle.Bundle, error)
+	GetBundle(url string) (Bundle, error)
 
 	// Get the bundle from the URL, and expect the content id to match expectedContentId.
 	// If it doesn't match, an error is thrown and we will get nil for bundle
 	// NOTE: Any double quotes character in expectedContentId will be ignored.
-	GetVersionedBundle(url string, expectedContentId string) (bundle.Bundle, error)
+	GetVersionedBundle(url string, expectedContentId string) (Bundle, error)
 
 	// Set a progress callback function so that it will be called when we have a progress tick
 	SetProgressCallback(callback ProgressCallback)
@@ -81,15 +79,15 @@ func (b *bundleProvider) SetProgressCallbackRate(rateSeconds int) {
 	b.progressCallbackRateInSeconds = rateSeconds
 }
 
-func (b *bundleProvider) GetVersionedBundle(url string, expectedContentId string) (bundle.Bundle, error) {
+func (b *bundleProvider) GetVersionedBundle(url string, expectedContentId string) (Bundle, error) {
 	return b.getBundle(url, expectedContentId)
 }
 
-func (b *bundleProvider) GetBundle(url string) (bundle.Bundle, error) {
+func (b *bundleProvider) GetBundle(url string) (Bundle, error) {
 	return b.getBundle(url, "")
 }
 
-func (b *bundleProvider) getBundle(url string, expectedContentId string) (bundle.Bundle, error) {
+func (b *bundleProvider) getBundle(url string, expectedContentId string) (Bundle, error) {
 	// convert our URL to a readable seekable stream
 	stream, contentId, contentLength, streamErr := stream.PathToStream(url, b.s3Client)
 	if streamErr != nil {
diff --git a/pkg/bundle/bundle_test.go b/pkg/bundle/bundle_test.go
@@ -5,9 +5,9 @@ package bundle
 
 import (
 	"fmt"
+	"github.com/aws-robotics/aws-robomaker-bundle-support-library/pkg/store"
 	"github.com/golang/mock/gomock"
 	"github.com/stretchr/testify/assert"
-	"go.amzn.com/robomaker/bundle_support/store"
 	"testing"
 )
 
diff --git a/pkg/extractors/bundle_v1_extractor.go b/pkg/extractors/bundle_v1_extractor.go
@@ -5,7 +5,7 @@ package extractors
 
 import (
 	"archive/tar"
-	"go.amzn.com/robomaker/bundle_support/file_system"
+	"github.com/aws-robotics/aws-robomaker-bundle-support-library/pkg/file_system"
 	"io"
 )
 
diff --git a/pkg/extractors/bundle_v1_extractor_test.go b/pkg/extractors/bundle_v1_extractor_test.go
diff --git a/pkg/extractors/extractor.go b/pkg/extractors/extractor.go
@@ -9,7 +9,7 @@ package extractors
 import (
 	"archive/tar"
 	"compress/gzip"
-	"go.amzn.com/robomaker/bundle_support/file_system"
+	"github.com/aws-robotics/aws-robomaker-bundle-support-library/pkg/file_system"
 	"io"
 )
 
diff --git a/pkg/extractors/targz_extractor.go b/pkg/extractors/targz_extractor.go
@@ -4,8 +4,8 @@ package extractors
 // SPDX-License-Identifier: Apache-2.0
 
 import (
-	"go.amzn.com/robomaker/bundle_support/3p/archiver"
-	"go.amzn.com/robomaker/bundle_support/file_system"
+	"github.com/aws-robotics/aws-robomaker-bundle-support-library/pkg/3p/archiver"
+	"github.com/aws-robotics/aws-robomaker-bundle-support-library/pkg/file_system"
 	"io"
 )
 
diff --git a/pkg/extractors/targz_extractor_test.go b/pkg/extractors/targz_extractor_test.go
@@ -5,9 +5,9 @@ package extractors
 
 import (
 	"errors"
+	"github.com/aws-robotics/aws-robomaker-bundle-support-library/pkg/file_system"
 	"github.com/golang/mock/gomock"
 	"github.com/stretchr/testify/assert"
-	"go.amzn.com/robomaker/bundle_support/file_system"
 	"testing"
 )
 
diff --git a/pkg/file_system/file_system.go b/pkg/file_system/file_system.go
diff --git a/pkg/s3/s3_reader.go b/pkg/s3/s3_reader.go
diff --git a/pkg/s3/s3_reader_test.go b/pkg/s3/s3_reader_test.go
diff --git a/pkg/store/bundle_store.go b/pkg/store/bundle_store.go
@@ -7,8 +7,8 @@ package store
 
 import (
 	"fmt"
-	"go.amzn.com/robomaker/bundle_support/extractors"
-	"go.amzn.com/robomaker/bundle_support/file_system"
+	"github.com/aws-robotics/aws-robomaker-bundle-support-library/pkg/extractors"
+	"github.com/aws-robotics/aws-robomaker-bundle-support-library/pkg/file_system"
 	"os"
 	"path/filepath"
 	"sync"
diff --git a/pkg/store/bundle_store_test.go b/pkg/store/bundle_store_test.go
@@ -5,10 +5,10 @@ package store
 
 import (
 	"errors"
+	"github.com/aws-robotics/aws-robomaker-bundle-support-library/pkg/extractors"
+	"github.com/aws-robotics/aws-robomaker-bundle-support-library/pkg/file_system"
 	"github.com/golang/mock/gomock"
 	"github.com/stretchr/testify/assert"
-	"go.amzn.com/robomaker/bundle_support/extractors"
-	"go.amzn.com/robomaker/bundle_support/file_system"
 	"os"
 	"path/filepath"
 	"testing"
diff --git a/pkg/stream/path_to_stream.go b/pkg/stream/path_to_stream.go
@@ -8,12 +8,12 @@ package stream
 import (
 	"crypto/md5"
 	"fmt"
+	"github.com/aws-robotics/aws-robomaker-bundle-support-library/pkg/file_system"
+	"github.com/aws-robotics/aws-robomaker-bundle-support-library/pkg/s3"
 	"github.com/aws/aws-sdk-go/aws"
 	"github.com/aws/aws-sdk-go/aws/session"
 	awsS3 "github.com/aws/aws-sdk-go/service/s3"
 	"github.com/aws/aws-sdk-go/service/s3/s3iface"
-	"go.amzn.com/robomaker/bundle_support/file_system"
-	"go.amzn.com/robomaker/bundle_support/s3"
 	"io"
 	"os"
 	"regexp"
diff --git a/pkg/stream/path_to_stream_test.go b/pkg/stream/path_to_stream_test.go
@@ -5,10 +5,10 @@ package stream
 
 import (
 	"fmt"
+	"github.com/aws-robotics/aws-robomaker-bundle-support-library/pkg/file_system"
 	"github.com/aws/aws-sdk-go/service/s3"
 	"github.com/golang/mock/gomock"
 	"github.com/stretchr/testify/assert"
-	"go.amzn.com/robomaker/bundle_support/file_system"
 	"testing"
 )
 

Original file line number	Diff line number	Diff line change
`@@ -4,8 +4,8 @@`
`4`	`4`	`package archive`
`5`	`5`
`6`	`6`	`import (`
`7`		`- "go.amzn.com/robomaker/bundle_support/bundle"`
`8`		`- "go.amzn.com/robomaker/bundle_support/store"`
	`7`	`+ "github.com/aws-robotics/aws-robomaker-bundle-support-library/pkg/bundle"`
	`8`	`+ "github.com/aws-robotics/aws-robomaker-bundle-support-library/pkg/store"`
`9`	`9`	`"io"`
`10`	`10`	`)`
`11`	`11`