From 2c52eca8727df744d093703bbcbd87fc39d57d30 Mon Sep 17 00:00:00 2001
From: "Joe Richey joerichey@google.com" <joerichey@google.com>
Date: Wed, 28 Jun 2017 13:57:55 -0700
Subject: Finalize import paths and documentation

This commit changes all the internal import paths from `fscrypt/foo` to
`github.com/google/fscrypt/foo` so that it can be built once we release
externaly. The documentation in README.md is updated accordingly.

Also, the README has a note noting that we do not make any guarantees
about project stability before 1.0 (when it ships with Ubuntu).

Change-Id: I6ba86e442c74057c8a06ba32a42e17f94833e280
---
 actions/callback.go       | 6 +++---
 actions/config.go         | 7 +++----
 actions/context.go        | 6 +++---
 actions/context_test.go   | 3 ++-
 actions/policy.go         | 8 ++++----
 actions/protector.go      | 4 ++--
 actions/protector_test.go | 8 ++++----
 7 files changed, 21 insertions(+), 21 deletions(-)

(limited to 'actions')

diff --git a/actions/callback.go b/actions/callback.go
index 2415d8c..f15893d 100644
--- a/actions/callback.go
+++ b/actions/callback.go
@@ -25,9 +25,9 @@ import (
 
 	"github.com/pkg/errors"
 
-	"fscrypt/crypto"
-	"fscrypt/filesystem"
-	"fscrypt/metadata"
+	"github.com/google/fscrypt/crypto"
+	"github.com/google/fscrypt/filesystem"
+	"github.com/google/fscrypt/metadata"
 )
 
 // ProtectorInfo is the information a caller will receive about a Protector
diff --git a/actions/config.go b/actions/config.go
index 1d81ff9..55010a5 100644
--- a/actions/config.go
+++ b/actions/config.go
@@ -28,12 +28,11 @@ import (
 	"time"
 
 	"github.com/pkg/errors"
-
 	"golang.org/x/sys/unix"
 
-	"fscrypt/crypto"
-	"fscrypt/metadata"
-	"fscrypt/util"
+	"github.com/google/fscrypt/crypto"
+	"github.com/google/fscrypt/metadata"
+	"github.com/google/fscrypt/util"
 )
 
 // LegacyConfig indicates that keys should be inserted into the keyring with the
diff --git a/actions/context.go b/actions/context.go
index f8d0a3d..8bf0287 100644
--- a/actions/context.go
+++ b/actions/context.go
@@ -33,9 +33,9 @@ import (
 
 	"github.com/pkg/errors"
 
-	"fscrypt/crypto"
-	"fscrypt/filesystem"
-	"fscrypt/metadata"
+	"github.com/google/fscrypt/crypto"
+	"github.com/google/fscrypt/filesystem"
+	"github.com/google/fscrypt/metadata"
 )
 
 // Errors relating to Config files or Config structures.
diff --git a/actions/context_test.go b/actions/context_test.go
index 79adedf..a92ef34 100644
--- a/actions/context_test.go
+++ b/actions/context_test.go
@@ -21,12 +21,13 @@ package actions
 
 import (
 	"fmt"
-	"fscrypt/util"
 	"log"
 	"os"
 	"path/filepath"
 	"testing"
 	"time"
+
+	"github.com/google/fscrypt/util"
 )
 
 const testTime = 10 * time.Millisecond
diff --git a/actions/policy.go b/actions/policy.go
index ff61e8b..e755883 100644
--- a/actions/policy.go
+++ b/actions/policy.go
@@ -26,10 +26,10 @@ import (
 
 	"github.com/pkg/errors"
 
-	"fscrypt/crypto"
-	"fscrypt/filesystem"
-	"fscrypt/metadata"
-	"fscrypt/util"
+	"github.com/google/fscrypt/crypto"
+	"github.com/google/fscrypt/filesystem"
+	"github.com/google/fscrypt/metadata"
+	"github.com/google/fscrypt/util"
 )
 
 // Errors relating to Policies
diff --git a/actions/protector.go b/actions/protector.go
index 0409b56..5245951 100644
--- a/actions/protector.go
+++ b/actions/protector.go
@@ -26,8 +26,8 @@ import (
 
 	"github.com/pkg/errors"
 
-	"fscrypt/crypto"
-	"fscrypt/metadata"
+	"github.com/google/fscrypt/crypto"
+	"github.com/google/fscrypt/metadata"
 )
 
 // Errors relating to Protectors
diff --git a/actions/protector_test.go b/actions/protector_test.go
index eacba83..6c81d49 100644
--- a/actions/protector_test.go
+++ b/actions/protector_test.go
@@ -25,7 +25,7 @@ import (
 
 	"github.com/pkg/errors"
 
-	. "fscrypt/crypto"
+	"github.com/google/fscrypt/crypto"
 )
 
 const testProtectorName = "my favorite protector"
@@ -33,11 +33,11 @@ const testProtectorName2 = testProtectorName + "2"
 
 var errCallback = errors.New("bad callback")
 
-func goodCallback(info ProtectorInfo, retry bool) (*Key, error) {
-	return NewFixedLengthKeyFromReader(bytes.NewReader(timingPassphrase), len(timingPassphrase))
+func goodCallback(info ProtectorInfo, retry bool) (*crypto.Key, error) {
+	return crypto.NewFixedLengthKeyFromReader(bytes.NewReader(timingPassphrase), len(timingPassphrase))
 }
 
-func badCallback(info ProtectorInfo, retry bool) (*Key, error) {
+func badCallback(info ProtectorInfo, retry bool) (*crypto.Key, error) {
 	return nil, errCallback
 }
 
-- 
cgit v1.2.3