Skip to content

Commit

Permalink
Undo breaking changes to exported packages
Browse files Browse the repository at this point in the history 
Signed-off-by: Mark S. Lewis <mark_lewis@uk.ibm.com>
  • Loading branch information
@bestbeforetoday @denyeart
bestbeforetoday authored and denyeart committed Apr 6, 2022
1 parent c025d5e commit 8651918
Show file tree
Hide file tree
Showing 111 changed files with 143 additions and 140 deletions.
2 changes: 1 addition & 1 deletion internal/pkg/api/client.go → api/client.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import (
"time"

"github.com/cloudflare/cfssl/csr"
"github.com/hyperledger/fabric-ca/internal/pkg/util"
"github.com/hyperledger/fabric-ca/util"
)

// RegistrationRequest for a new identity
Expand Down
0 internal/pkg/api/net.go → api/net.go
View file
File renamed without changes.
0 internal/pkg/api/serverresponses.go → api/serverresponses.go
View file
File renamed without changes.
4 changes: 2 additions & 2 deletions cmd/fabric-ca-client/command/affiliation.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@ import (
"fmt"

"github.com/cloudflare/cfssl/log"
"github.com/hyperledger/fabric-ca/internal/pkg/api"
calog "github.com/hyperledger/fabric-ca/internal/pkg/log"
"github.com/hyperledger/fabric-ca/api"
calog "github.com/hyperledger/fabric-ca/lib/common/log"
"github.com/spf13/cobra"
)

Expand Down
6 changes: 3 additions & 3 deletions cmd/fabric-ca-client/command/certificate.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,10 @@ import (
"time"

"github.com/cloudflare/cfssl/log"
"github.com/hyperledger/fabric-ca/internal/pkg/api"
calog "github.com/hyperledger/fabric-ca/internal/pkg/log"
"github.com/hyperledger/fabric-ca/internal/pkg/util"
"github.com/hyperledger/fabric-ca/api"
"github.com/hyperledger/fabric-ca/lib"
calog "github.com/hyperledger/fabric-ca/lib/common/log"
"github.com/hyperledger/fabric-ca/util"
"github.com/pkg/errors"
"github.com/spf13/cobra"
)
Expand Down
2 changes: 1 addition & 1 deletion cmd/fabric-ca-client/command/certificate_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@ import (
"time"

"github.com/hyperledger/fabric-ca/cmd/fabric-ca-client/command/mocks"
"github.com/hyperledger/fabric-ca/internal/pkg/util"
"github.com/hyperledger/fabric-ca/lib"
"github.com/hyperledger/fabric-ca/util"
"github.com/pkg/errors"
"github.com/spf13/cobra"
"github.com/spf13/viper"
Expand Down
2 changes: 1 addition & 1 deletion cmd/fabric-ca-client/command/clientcmd.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,9 @@ import (
"strings"

"github.com/cloudflare/cfssl/log"
"github.com/hyperledger/fabric-ca/internal/pkg/util"
"github.com/hyperledger/fabric-ca/lib"
"github.com/hyperledger/fabric-ca/lib/metadata"
"github.com/hyperledger/fabric-ca/util"
"github.com/pkg/profile"
"github.com/spf13/cobra"
"github.com/spf13/viper"
Expand Down
6 changes: 3 additions & 3 deletions cmd/fabric-ca-client/command/config.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,11 @@ import (

"github.com/cloudflare/cfssl/csr"
"github.com/cloudflare/cfssl/log"
"github.com/hyperledger/fabric-ca/internal/pkg/api"
calog "github.com/hyperledger/fabric-ca/internal/pkg/log"
"github.com/hyperledger/fabric-ca/internal/pkg/util"
"github.com/hyperledger/fabric-ca/api"
"github.com/hyperledger/fabric-ca/lib"
"github.com/hyperledger/fabric-ca/lib/attr"
calog "github.com/hyperledger/fabric-ca/lib/common/log"
"github.com/hyperledger/fabric-ca/util"
"github.com/pkg/errors"
)

Expand Down
4 changes: 2 additions & 2 deletions cmd/fabric-ca-client/command/gencrl.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,9 @@ import (
"time"

"github.com/cloudflare/cfssl/log"
"github.com/hyperledger/fabric-ca/internal/pkg/api"
"github.com/hyperledger/fabric-ca/internal/pkg/util"
"github.com/hyperledger/fabric-ca/api"
"github.com/hyperledger/fabric-ca/lib"
"github.com/hyperledger/fabric-ca/util"
"github.com/pkg/errors"
"github.com/spf13/cobra"
)
Expand Down
4 changes: 2 additions & 2 deletions cmd/fabric-ca-client/command/getcainfo.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,9 +28,9 @@ import (
"strings"

"github.com/cloudflare/cfssl/log"
"github.com/hyperledger/fabric-ca/internal/pkg/api"
"github.com/hyperledger/fabric-ca/internal/pkg/util"
"github.com/hyperledger/fabric-ca/api"
"github.com/hyperledger/fabric-ca/lib"
"github.com/hyperledger/fabric-ca/util"
"github.com/pkg/errors"
"github.com/spf13/cobra"
)
Expand Down
6 changes: 3 additions & 3 deletions cmd/fabric-ca-client/command/identity.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,10 +20,10 @@ import (
"fmt"

"github.com/cloudflare/cfssl/log"
"github.com/hyperledger/fabric-ca/internal/pkg/api"
calog "github.com/hyperledger/fabric-ca/internal/pkg/log"
"github.com/hyperledger/fabric-ca/internal/pkg/util"
"github.com/hyperledger/fabric-ca/api"
"github.com/hyperledger/fabric-ca/lib"
calog "github.com/hyperledger/fabric-ca/lib/common/log"
"github.com/hyperledger/fabric-ca/util"
"github.com/pkg/errors"
"github.com/spf13/cobra"
)
Expand Down
4 changes: 2 additions & 2 deletions cmd/fabric-ca-client/command/main_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,15 +28,15 @@ import (

"github.com/cloudflare/cfssl/csr"
"github.com/cloudflare/cfssl/log"
"github.com/hyperledger/fabric-ca/internal/pkg/api"
"github.com/hyperledger/fabric-ca/internal/pkg/util"
"github.com/hyperledger/fabric-ca/api"
"github.com/hyperledger/fabric-ca/lib"
"github.com/hyperledger/fabric-ca/lib/attr"
"github.com/hyperledger/fabric-ca/lib/attrmgr"
"github.com/hyperledger/fabric-ca/lib/metadata"
"github.com/hyperledger/fabric-ca/lib/server/db"
"github.com/hyperledger/fabric-ca/lib/server/db/sqlite"
cadbuser "github.com/hyperledger/fabric-ca/lib/server/user"
"github.com/hyperledger/fabric-ca/util"
"github.com/stretchr/testify/assert"
)

Expand Down
2 changes: 1 addition & 1 deletion cmd/fabric-ca-client/command/reenroll.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import (
"path/filepath"

"github.com/cloudflare/cfssl/log"
"github.com/hyperledger/fabric-ca/internal/pkg/api"
"github.com/hyperledger/fabric-ca/api"
"github.com/hyperledger/fabric-ca/lib"
"github.com/pkg/errors"
"github.com/spf13/cobra"
Expand Down
4 changes: 2 additions & 2 deletions cmd/fabric-ca-client/command/revoke.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,9 @@ import (
"path/filepath"

"github.com/cloudflare/cfssl/log"
"github.com/hyperledger/fabric-ca/internal/pkg/api"
"github.com/hyperledger/fabric-ca/internal/pkg/util"
"github.com/hyperledger/fabric-ca/api"
"github.com/hyperledger/fabric-ca/lib"
"github.com/hyperledger/fabric-ca/util"
"github.com/pkg/errors"
"github.com/spf13/cobra"
)
Expand Down
4 changes: 2 additions & 2 deletions cmd/fabric-ca-server/config.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,10 @@ import (
"strings"

"github.com/cloudflare/cfssl/log"
calog "github.com/hyperledger/fabric-ca/internal/pkg/log"
"github.com/hyperledger/fabric-ca/internal/pkg/util"
"github.com/hyperledger/fabric-ca/lib"
calog "github.com/hyperledger/fabric-ca/lib/common/log"
"github.com/hyperledger/fabric-ca/lib/metadata"
"github.com/hyperledger/fabric-ca/util"
"github.com/pkg/errors"
)

Expand Down
4 changes: 2 additions & 2 deletions cmd/fabric-ca-server/main_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,10 @@ import (
"testing"

"github.com/cloudflare/cfssl/log"
"github.com/hyperledger/fabric-ca/internal/pkg/api"
"github.com/hyperledger/fabric-ca/internal/pkg/util"
"github.com/hyperledger/fabric-ca/api"
"github.com/hyperledger/fabric-ca/lib"
"github.com/hyperledger/fabric-ca/lib/metadata"
"github.com/hyperledger/fabric-ca/util"
"github.com/spf13/viper"
"github.com/stretchr/testify/assert"
)
Expand Down
2 changes: 1 addition & 1 deletion cmd/fabric-ca-server/servercmd.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,9 @@ import (
"strings"

"github.com/cloudflare/cfssl/log"
"github.com/hyperledger/fabric-ca/internal/pkg/util"
"github.com/hyperledger/fabric-ca/lib"
"github.com/hyperledger/fabric-ca/lib/metadata"
"github.com/hyperledger/fabric-ca/util"
"github.com/pkg/errors"
"github.com/spf13/cobra"
"github.com/spf13/viper"
Expand Down
4 changes: 2 additions & 2 deletions lib/attr/attribute.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@ import (
"strings"

"github.com/cloudflare/cfssl/log"
"github.com/hyperledger/fabric-ca/internal/pkg/api"
"github.com/hyperledger/fabric-ca/internal/pkg/util"
"github.com/hyperledger/fabric-ca/api"
"github.com/hyperledger/fabric-ca/util"
"github.com/pkg/errors"
)

Expand Down
2 changes: 1 addition & 1 deletion lib/attr/attribute_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ package attr
import (
"testing"

"github.com/hyperledger/fabric-ca/internal/pkg/api"
"github.com/hyperledger/fabric-ca/api"
"github.com/pkg/errors"
"github.com/stretchr/testify/assert"
)
Expand Down
4 changes: 2 additions & 2 deletions lib/ca.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,7 @@ import (
"github.com/cloudflare/cfssl/log"
"github.com/cloudflare/cfssl/signer"
cflocalsigner "github.com/cloudflare/cfssl/signer/local"
"github.com/hyperledger/fabric-ca/internal/pkg/api"
"github.com/hyperledger/fabric-ca/internal/pkg/util"
"github.com/hyperledger/fabric-ca/api"
"github.com/hyperledger/fabric-ca/lib/attr"
"github.com/hyperledger/fabric-ca/lib/attrmgr"
"github.com/hyperledger/fabric-ca/lib/caerrors"
Expand All @@ -47,6 +46,7 @@ import (
"github.com/hyperledger/fabric-ca/lib/server/user"
cadbuser "github.com/hyperledger/fabric-ca/lib/server/user"
"github.com/hyperledger/fabric-ca/lib/tls"
"github.com/hyperledger/fabric-ca/util"
"github.com/hyperledger/fabric/bccsp"
"github.com/pkg/errors"
)
Expand Down
4 changes: 2 additions & 2 deletions lib/ca_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,11 @@ import (
"testing"

"github.com/cloudflare/cfssl/csr"
"github.com/hyperledger/fabric-ca/internal/pkg/api"
"github.com/hyperledger/fabric-ca/internal/pkg/util"
"github.com/hyperledger/fabric-ca/api"
"github.com/hyperledger/fabric-ca/lib/mocks"
"github.com/hyperledger/fabric-ca/lib/server/db/sqlite"
dbutil "github.com/hyperledger/fabric-ca/lib/server/db/util"
"github.com/hyperledger/fabric-ca/util"
"github.com/hyperledger/fabric/common/metrics/metricsfakes"
"github.com/stretchr/testify/assert"
)
Expand Down
4 changes: 2 additions & 2 deletions lib/caconfig.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,12 @@ import (
"time"

"github.com/cloudflare/cfssl/config"
"github.com/hyperledger/fabric-ca/internal/pkg/api"
"github.com/hyperledger/fabric-ca/internal/pkg/util"
"github.com/hyperledger/fabric-ca/api"
dbutil "github.com/hyperledger/fabric-ca/lib/server/db/util"
"github.com/hyperledger/fabric-ca/lib/server/idemix"
"github.com/hyperledger/fabric-ca/lib/server/ldap"
"github.com/hyperledger/fabric-ca/lib/tls"
"github.com/hyperledger/fabric-ca/util"
"github.com/hyperledger/fabric/bccsp/factory"
)

Expand Down
2 changes: 1 addition & 1 deletion lib/certdbaccessor.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,11 @@ import (
"github.com/cloudflare/cfssl/certdb"
certsql "github.com/cloudflare/cfssl/certdb/sql"
"github.com/cloudflare/cfssl/log"
"github.com/hyperledger/fabric-ca/internal/pkg/util"
cr "github.com/hyperledger/fabric-ca/lib/server/certificaterequest"
"github.com/hyperledger/fabric-ca/lib/server/db"
cadb "github.com/hyperledger/fabric-ca/lib/server/db"
dbutil "github.com/hyperledger/fabric-ca/lib/server/db/util"
"github.com/hyperledger/fabric-ca/util"
"github.com/jmoiron/sqlx"
"github.com/kisielk/sqlstruct"
"github.com/pkg/errors"
Expand Down
2 changes: 1 addition & 1 deletion lib/certdbaccessor_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,12 +20,12 @@ import (

"github.com/cloudflare/cfssl/certdb"
"github.com/cloudflare/cfssl/log"
"github.com/hyperledger/fabric-ca/internal/pkg/util"
"github.com/hyperledger/fabric-ca/lib/mocks"
"github.com/hyperledger/fabric-ca/lib/server/certificaterequest"
"github.com/hyperledger/fabric-ca/lib/server/db"
dbutil "github.com/hyperledger/fabric-ca/lib/server/db/util"
cadbuser "github.com/hyperledger/fabric-ca/lib/server/user"
"github.com/hyperledger/fabric-ca/util"
"github.com/hyperledger/fabric/common/metrics/metricsfakes"
"github.com/jmoiron/sqlx"
"github.com/pkg/errors"
Expand Down
4 changes: 2 additions & 2 deletions lib/client.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,13 +27,13 @@ import (
"github.com/cloudflare/cfssl/log"
proto "github.com/golang/protobuf/proto"
fp256bn "github.com/hyperledger/fabric-amcl/amcl/FP256BN"
"github.com/hyperledger/fabric-ca/internal/pkg/api"
"github.com/hyperledger/fabric-ca/internal/pkg/util"
"github.com/hyperledger/fabric-ca/api"
"github.com/hyperledger/fabric-ca/lib/client/credential"
idemixcred "github.com/hyperledger/fabric-ca/lib/client/credential/idemix"
x509cred "github.com/hyperledger/fabric-ca/lib/client/credential/x509"
"github.com/hyperledger/fabric-ca/lib/streamer"
"github.com/hyperledger/fabric-ca/lib/tls"
"github.com/hyperledger/fabric-ca/util"
"github.com/hyperledger/fabric/bccsp"
cspsigner "github.com/hyperledger/fabric/bccsp/signer"
"github.com/hyperledger/fabric/idemix"
Expand Down
2 changes: 1 addition & 1 deletion lib/client/credential/credential.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ package credential
import (
"net/http"

"github.com/hyperledger/fabric-ca/internal/pkg/api"
"github.com/hyperledger/fabric-ca/api"
)

// Credential represents an credential of an identity
Expand Down
4 changes: 2 additions & 2 deletions lib/client/credential/idemix/credential.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@ import (
"github.com/cloudflare/cfssl/log"
"github.com/golang/protobuf/proto"
fp256bn "github.com/hyperledger/fabric-amcl/amcl/FP256BN"
"github.com/hyperledger/fabric-ca/internal/pkg/api"
"github.com/hyperledger/fabric-ca/internal/pkg/util"
"github.com/hyperledger/fabric-ca/api"
"github.com/hyperledger/fabric-ca/util"
"github.com/hyperledger/fabric/bccsp"
idemix "github.com/hyperledger/fabric/idemix"
"github.com/pkg/errors"
Expand Down
4 changes: 2 additions & 2 deletions lib/client/credential/x509/credential.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,9 @@ import (
"net/http"

"github.com/cloudflare/cfssl/log"
"github.com/hyperledger/fabric-ca/internal/pkg/api"
"github.com/hyperledger/fabric-ca/internal/pkg/util"
"github.com/hyperledger/fabric-ca/api"
"github.com/hyperledger/fabric-ca/lib/client/credential"
"github.com/hyperledger/fabric-ca/util"
"github.com/hyperledger/fabric/bccsp"
"github.com/pkg/errors"
)
Expand Down
4 changes: 2 additions & 2 deletions lib/client/credential/x509/credential_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,12 +16,12 @@ import (
"path/filepath"
"testing"

"github.com/hyperledger/fabric-ca/internal/pkg/api"
"github.com/hyperledger/fabric-ca/internal/pkg/util"
"github.com/hyperledger/fabric-ca/api"
"github.com/hyperledger/fabric-ca/lib"
"github.com/hyperledger/fabric-ca/lib/client/credential"
. "github.com/hyperledger/fabric-ca/lib/client/credential/x509"
"github.com/hyperledger/fabric-ca/lib/client/credential/x509/mocks"
"github.com/hyperledger/fabric-ca/util"
"github.com/hyperledger/fabric/bccsp/factory"
"github.com/stretchr/testify/assert"
)
Expand Down
6 changes: 4 additions & 2 deletions lib/client/credential/x509/mocks/Identity.go
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion lib/client/credential/x509/signer.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ import (
"crypto/x509"
"fmt"

"github.com/hyperledger/fabric-ca/internal/pkg/util"
"github.com/hyperledger/fabric-ca/lib/attrmgr"
"github.com/hyperledger/fabric-ca/util"
"github.com/hyperledger/fabric/bccsp"
"github.com/pkg/errors"
)
Expand Down
2 changes: 1 addition & 1 deletion lib/client/credential/x509/signer_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ import (
"path/filepath"
"testing"

"github.com/hyperledger/fabric-ca/internal/pkg/util"
. "github.com/hyperledger/fabric-ca/lib/client/credential/x509"
"github.com/hyperledger/fabric-ca/util"
"github.com/stretchr/testify/assert"
)

Expand Down
4 changes: 2 additions & 2 deletions lib/client_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,12 +19,12 @@ import (
"time"

"github.com/cloudflare/cfssl/csr"
"github.com/hyperledger/fabric-ca/internal/pkg/api"
"github.com/hyperledger/fabric-ca/internal/pkg/util"
"github.com/hyperledger/fabric-ca/api"
. "github.com/hyperledger/fabric-ca/lib"
"github.com/hyperledger/fabric-ca/lib/attrmgr"
"github.com/hyperledger/fabric-ca/lib/client/credential/x509"
"github.com/hyperledger/fabric-ca/lib/tls"
"github.com/hyperledger/fabric-ca/util"
"github.com/hyperledger/fabric/bccsp"
"github.com/pkg/errors"
"github.com/stretchr/testify/assert"
Expand Down
4 changes: 2 additions & 2 deletions lib/client_whitebox_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@ import (
"github.com/cloudflare/cfssl/csr"
"github.com/cloudflare/cfssl/log"
"github.com/cloudflare/cfssl/signer"
"github.com/hyperledger/fabric-ca/internal/pkg/api"
"github.com/hyperledger/fabric-ca/internal/pkg/util"
"github.com/hyperledger/fabric-ca/api"
"github.com/hyperledger/fabric-ca/util"
"github.com/hyperledger/fabric/bccsp"
"github.com/hyperledger/fabric/bccsp/factory"
cspsigner "github.com/hyperledger/fabric/bccsp/signer"
Expand Down

0 comments on commit 8651918

Please sign in to comment.