[FAB-5346] Use vendored attrmgr

This deletes fabric-ca/attrmgr and uses the vendored attrmgr from fabric. Change-Id: Ia0e708de63b7af176ad2b37b6473ecbcc985c002 Signed-off-by: Keith Smith <[email protected]>
hyperledger · Sep 19, 2017 · f7cc93a · f7cc93a
1 parent 3b9d83c
commit f7cc93a
Show file tree

Hide file tree

Showing 7 changed files with 5 additions and 311 deletions.
diff --git a/attrmgr/attrmgr.go b/attrmgr/attrmgr.go
diff --git a/attrmgr/attrmgr_test.go b/attrmgr/attrmgr_test.go
diff --git a/cmd/fabric-ca-client/main_test.go b/cmd/fabric-ca-client/main_test.go
@@ -31,10 +31,10 @@ import (
 	"testing"
 
 	"github.com/hyperledger/fabric-ca/api"
-	"github.com/hyperledger/fabric-ca/attrmgr"
 	"github.com/hyperledger/fabric-ca/lib"
 	"github.com/hyperledger/fabric-ca/lib/dbutil"
 	"github.com/hyperledger/fabric-ca/util"
+	"github.com/hyperledger/fabric/common/attrmgr"
 	"github.com/stretchr/testify/assert"
 )
 

diff --git a/lib/ca.go b/lib/ca.go
@@ -39,14 +39,14 @@ import (
 	"github.com/cloudflare/cfssl/log"
 	"github.com/cloudflare/cfssl/signer"
 	"github.com/hyperledger/fabric-ca/api"
-	"github.com/hyperledger/fabric-ca/attrmgr"
 	"github.com/hyperledger/fabric-ca/lib/dbutil"
 	"github.com/hyperledger/fabric-ca/lib/ldap"
 	"github.com/hyperledger/fabric-ca/lib/spi"
 	"github.com/hyperledger/fabric-ca/lib/tcert"
 	"github.com/hyperledger/fabric-ca/lib/tls"
 	"github.com/hyperledger/fabric-ca/util"
 	"github.com/hyperledger/fabric/bccsp"
+	"github.com/hyperledger/fabric/common/attrmgr"
 	"github.com/jmoiron/sqlx"
 
 	_ "github.com/go-sql-driver/mysql" // import to support MySQL

diff --git a/lib/client_test.go b/lib/client_test.go
@@ -29,10 +29,10 @@ import (
 
 	"github.com/cloudflare/cfssl/csr"
 	"github.com/hyperledger/fabric-ca/api"
-	"github.com/hyperledger/fabric-ca/attrmgr"
 	. "github.com/hyperledger/fabric-ca/lib"
 	"github.com/hyperledger/fabric-ca/lib/tls"
 	"github.com/hyperledger/fabric-ca/util"
+	"github.com/hyperledger/fabric/common/attrmgr"
 	"github.com/stretchr/testify/assert"
 )
 

diff --git a/lib/serverrequestcontext.go b/lib/serverrequestcontext.go
@@ -30,10 +30,10 @@ import (
 	"github.com/cloudflare/cfssl/revoke"
 	"github.com/cloudflare/cfssl/signer"
 	"github.com/hyperledger/fabric-ca/api"
-	"github.com/hyperledger/fabric-ca/attrmgr"
 	"github.com/hyperledger/fabric-ca/lib/spi"
 	"github.com/hyperledger/fabric-ca/lib/tcert"
 	"github.com/hyperledger/fabric-ca/util"
+	"github.com/hyperledger/fabric/common/attrmgr"
 	"github.com/pkg/errors"
 )
 

diff --git a/lib/signer.go b/lib/signer.go
@@ -22,9 +22,9 @@ import (
 
 	"github.com/cloudflare/cfssl/log"
 	"github.com/hyperledger/fabric-ca/api"
-	"github.com/hyperledger/fabric-ca/attrmgr"
 	"github.com/hyperledger/fabric-ca/util"
 	"github.com/hyperledger/fabric/bccsp"
+	"github.com/hyperledger/fabric/common/attrmgr"
 )
 
 func newSigner(key bccsp.Key, cert []byte, id *Identity) *Signer {