Rename externalbuilders package to externalbuilder

FAB-16108 Change-Id: Ia45f537bf39564cb451d1f4766abd570ea11b132 Signed-off-by: Matthew Sykes <[email protected]>
hyperledger · Nov 20, 2019 · 109fccb · 109fccb
1 parent 6257073
commit 109fccb
Show file tree

Hide file tree

Showing 32 changed files with 86 additions and 86 deletions.
diff --git a/core/chaincode/lifecycle/cache.go b/core/chaincode/lifecycle/cache.go
@@ -16,7 +16,7 @@ import (
 	"github.com/hyperledger/fabric/common/chaincode"
 	"github.com/hyperledger/fabric/common/util"
 	"github.com/hyperledger/fabric/core/chaincode/persistence"
-	"github.com/hyperledger/fabric/core/container/externalbuilders"
+	"github.com/hyperledger/fabric/core/container/externalbuilder"
 	"github.com/hyperledger/fabric/core/ledger"
 	"github.com/hyperledger/fabric/protoutil"
 
@@ -122,7 +122,7 @@ func (l *LocalChaincode) createMetadataMapFromReferences() map[string][]*chainco
 	return references
 }
 
-func NewCache(resources *Resources, myOrgMSPID string, metadataManager MetadataHandler, custodian *ChaincodeCustodian, ebMetadata *externalbuilders.MetadataProvider) *Cache {
+func NewCache(resources *Resources, myOrgMSPID string, metadataManager MetadataHandler, custodian *ChaincodeCustodian, ebMetadata *externalbuilder.MetadataProvider) *Cache {
 	return &Cache{
 		chaincodeCustodian: custodian,
 		definedChaincodes:  map[string]*ChannelCache{},

diff --git a/core/chaincode/lifecycle/cache_test.go b/core/chaincode/lifecycle/cache_test.go
@@ -20,7 +20,7 @@ import (
 	"github.com/hyperledger/fabric/core/chaincode/lifecycle/mock"
 	"github.com/hyperledger/fabric/core/chaincode/persistence"
 	"github.com/hyperledger/fabric/core/container"
-	"github.com/hyperledger/fabric/core/container/externalbuilders"
+	"github.com/hyperledger/fabric/core/container/externalbuilder"
 	"github.com/hyperledger/fabric/core/ledger"
 	ledgermock "github.com/hyperledger/fabric/core/ledger/mock"
 	"github.com/hyperledger/fabric/protoutil"
@@ -76,7 +76,7 @@ var _ = Describe("Cache", func() {
 		chaincodeCustodian = lifecycle.NewChaincodeCustodian()
 
 		var err error
-		c = lifecycle.NewCache(resources, "my-mspid", fakeMetadataHandler, chaincodeCustodian, &externalbuilders.MetadataProvider{})
+		c = lifecycle.NewCache(resources, "my-mspid", fakeMetadataHandler, chaincodeCustodian, &externalbuilder.MetadataProvider{})
 		Expect(err).NotTo(HaveOccurred())
 
 		channelCache = &lifecycle.ChannelCache{

diff --git a/core/chaincode/lifecycle/event_broker.go b/core/chaincode/lifecycle/event_broker.go
@@ -8,23 +8,23 @@ package lifecycle
 import (
 	"sync"
 
-	"github.com/hyperledger/fabric/core/container/externalbuilders"
+	"github.com/hyperledger/fabric/core/container/externalbuilder"
 	"github.com/hyperledger/fabric/core/ledger"
 	"github.com/pkg/errors"
 )
 
 // EventBroker receives events from lifecycle cache and in turn invokes the registered listeners
 type EventBroker struct {
 	chaincodeStore       ChaincodeStore
-	ebMetadata           *externalbuilders.MetadataProvider
+	ebMetadata           *externalbuilder.MetadataProvider
 	pkgParser            PackageParser
 	defineCallbackStatus *sync.Map
 
 	mutex     sync.Mutex
 	listeners map[string][]ledger.ChaincodeLifecycleEventListener
 }
 
-func NewEventBroker(chaincodeStore ChaincodeStore, pkgParser PackageParser, ebMetadata *externalbuilders.MetadataProvider) *EventBroker {
+func NewEventBroker(chaincodeStore ChaincodeStore, pkgParser PackageParser, ebMetadata *externalbuilder.MetadataProvider) *EventBroker {
 	return &EventBroker{
 		chaincodeStore:       chaincodeStore,
 		ebMetadata:           ebMetadata,

diff --git a/core/chaincode/lifecycle/event_broker_test.go b/core/chaincode/lifecycle/event_broker_test.go
@@ -15,7 +15,7 @@ import (
 	"github.com/hyperledger/fabric/core/chaincode/lifecycle"
 	"github.com/hyperledger/fabric/core/chaincode/lifecycle/mock"
 	"github.com/hyperledger/fabric/core/chaincode/persistence"
-	"github.com/hyperledger/fabric/core/container/externalbuilders"
+	"github.com/hyperledger/fabric/core/container/externalbuilder"
 	"github.com/hyperledger/fabric/core/ledger"
 	ledgermock "github.com/hyperledger/fabric/core/ledger/mock"
 	. "github.com/onsi/ginkgo"
@@ -31,14 +31,14 @@ var _ = Describe("EventBroker", func() {
 		eventBroker        *lifecycle.EventBroker
 		cachedChaincodeDef *lifecycle.CachedChaincodeDefinition
 		localChaincode     *lifecycle.LocalChaincode
-		ebMetadata         *externalbuilders.MetadataProvider
+		ebMetadata         *externalbuilder.MetadataProvider
 	)
 
 	BeforeEach(func() {
 		fakeListener = &ledgermock.ChaincodeLifecycleEventListener{}
 		chaincodeStore = &mock.ChaincodeStore{}
 		pkgParser = &mock.PackageParser{}
-		ebMetadata = &externalbuilders.MetadataProvider{
+		ebMetadata = &externalbuilder.MetadataProvider{
 			DurablePath: "testdata",
 		}
 		eventBroker = lifecycle.NewEventBroker(chaincodeStore, pkgParser, ebMetadata)

diff --git a/...iner/externalbuilders/externalbuilders.go → ...tainer/externalbuilder/externalbuilder.go b/...iner/externalbuilders/externalbuilders.go → ...tainer/externalbuilder/externalbuilder.go
@@ -4,7 +4,7 @@ Copyright IBM Corp. All Rights Reserved.
 SPDX-License-Identifier: Apache-2.0
 */
 
-package externalbuilders
+package externalbuilder
 
 import (
 	"encoding/json"
@@ -26,7 +26,7 @@ import (
 
 var (
 	DefaultEnvWhitelist = []string{"LD_LIBRARY_PATH", "LIBPATH", "PATH", "TMPDIR"}
-	logger              = flogging.MustGetLogger("chaincode.externalbuilders")
+	logger              = flogging.MustGetLogger("chaincode.externalbuilder")
 )
 
 const MetadataFile = "metadata.json"

diff --git a/...albuilders/externalbuilders_suite_test.go → ...rnalbuilder/externalbuilder_suite_test.go b/...albuilders/externalbuilders_suite_test.go → ...rnalbuilder/externalbuilder_suite_test.go
@@ -4,7 +4,7 @@ Copyright IBM Corp. All Rights Reserved.
 SPDX-License-Identifier: Apache-2.0
 */
 
-package externalbuilders_test
+package externalbuilder_test
 
 import (
 	"testing"
@@ -15,5 +15,5 @@ import (
 
 func TestExternalbuilders(t *testing.T) {
 	RegisterFailHandler(Fail)
-	RunSpecs(t, "Externalbuilders Suite")
+	RunSpecs(t, "External Builder Suite")
 }
diff --git a/...externalbuilders/externalbuilders_test.go → ...r/externalbuilder/externalbuilder_test.go b/...externalbuilders/externalbuilders_test.go → ...r/externalbuilder/externalbuilder_test.go
@@ -4,7 +4,7 @@ Copyright IBM Corp. All Rights Reserved.
 SPDX-License-Identifier: Apache-2.0
 */
 
-package externalbuilders_test
+package externalbuilder_test
 
 import (
 	"fmt"
@@ -17,7 +17,7 @@ import (
 	"github.com/hyperledger/fabric/common/flogging"
 	"github.com/hyperledger/fabric/core/chaincode/persistence"
 	"github.com/hyperledger/fabric/core/container/ccintf"
-	"github.com/hyperledger/fabric/core/container/externalbuilders"
+	"github.com/hyperledger/fabric/core/container/externalbuilder"
 	"github.com/hyperledger/fabric/core/peer"
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
@@ -26,7 +26,7 @@ import (
 	"go.uber.org/zap/zapcore"
 )
 
-var _ = Describe("Externalbuilders", func() {
+var _ = Describe("externalbuilder", func() {
 	var (
 		codePackage *os.File
 		logger      *flogging.FabricLogger
@@ -56,7 +56,7 @@ var _ = Describe("Externalbuilders", func() {
 
 	Describe("NewBuildContext", func() {
 		It("creates a new context, including temporary locations", func() {
-			buildContext, err := externalbuilders.NewBuildContext("fake-package-id", md, codePackage)
+			buildContext, err := externalbuilder.NewBuildContext("fake-package-id", md, codePackage)
 			Expect(err).NotTo(HaveOccurred())
 			defer buildContext.Cleanup()
 
@@ -80,14 +80,14 @@ var _ = Describe("Externalbuilders", func() {
 				codePackage, err := os.Open("testdata/archive_with_absolute.tar.gz")
 				Expect(err).NotTo(HaveOccurred())
 				defer codePackage.Close()
-				_, err = externalbuilders.NewBuildContext("fake-package-id", md, codePackage)
+				_, err = externalbuilder.NewBuildContext("fake-package-id", md, codePackage)
 				Expect(err).To(MatchError(ContainSubstring("could not untar source package")))
 			})
 		})
 
 		Context("when package id contains inappropriate chars", func() {
 			It("replaces them with dash", func() {
-				buildContext, err := externalbuilders.NewBuildContext("i&am/pkg:id", md, codePackage)
+				buildContext, err := externalbuilder.NewBuildContext("i&am/pkg:id", md, codePackage)
 				Expect(err).NotTo(HaveOccurred())
 				Expect(buildContext.ScratchDir).To(ContainSubstring("fabric-i-am-pkg-id"))
 			})
@@ -97,16 +97,16 @@ var _ = Describe("Externalbuilders", func() {
 	Describe("Detector", func() {
 		var (
 			durablePath string
-			detector    *externalbuilders.Detector
+			detector    *externalbuilder.Detector
 		)
 
 		BeforeEach(func() {
 			var err error
 			durablePath, err = ioutil.TempDir("", "detect-test")
 			Expect(err).NotTo(HaveOccurred())
 
-			detector = &externalbuilders.Detector{
-				Builders: externalbuilders.CreateBuilders([]peer.ExternalBuilder{
+			detector = &externalbuilder.Detector{
+				Builders: externalbuilder.CreateBuilders([]peer.ExternalBuilder{
 					{Path: "bad1", Name: "bad1"},
 					{Path: "testdata/goodbuilder", Name: "goodbuilder"},
 					{Path: "bad2", Name: "bad2"},
@@ -163,7 +163,7 @@ var _ = Describe("Externalbuilders", func() {
 		})
 
 		Describe("CachedBuild", func() {
-			var existingInstance *externalbuilders.Instance
+			var existingInstance *externalbuilder.Instance
 
 			BeforeEach(func() {
 				var err error
@@ -219,19 +219,19 @@ var _ = Describe("Externalbuilders", func() {
 
 	Describe("Builders", func() {
 		var (
-			builder      *externalbuilders.Builder
-			buildContext *externalbuilders.BuildContext
+			builder      *externalbuilder.Builder
+			buildContext *externalbuilder.BuildContext
 		)
 
 		BeforeEach(func() {
-			builder = &externalbuilders.Builder{
+			builder = &externalbuilder.Builder{
 				Location: "testdata/goodbuilder",
 				Name:     "goodbuilder",
 				Logger:   logger,
 			}
 
 			var err error
-			buildContext, err = externalbuilders.NewBuildContext("fake-package-id", md, codePackage)
+			buildContext, err = externalbuilder.NewBuildContext("fake-package-id", md, codePackage)
 			Expect(err).NotTo(HaveOccurred())
 		})
 
@@ -347,7 +347,7 @@ var _ = Describe("Externalbuilders", func() {
 		Describe("NewCommand", func() {
 			It("only propagates expected variables", func() {
 				var expectedEnv []string
-				for _, key := range externalbuilders.DefaultEnvWhitelist {
+				for _, key := range externalbuilder.DefaultEnvWhitelist {
 					if val, ok := os.LookupEnv(key); ok {
 						expectedEnv = append(expectedEnv, fmt.Sprintf("%s=%s", key, val))
 					}
@@ -379,15 +379,15 @@ var _ = Describe("Externalbuilders", func() {
 
 		It("runs the command, directs stderr to the logger, and includes the command name", func() {
 			cmd := exec.Command("/bin/sh", "-c", `echo stdout && echo stderr >&2`)
-			err := externalbuilders.RunCommand(logger, cmd)
+			err := externalbuilder.RunCommand(logger, cmd)
 			Expect(err).NotTo(HaveOccurred())
 			Expect(buf).To(gbytes.Say("stderr\t" + `{"command": "sh"}` + "\n"))
 		})
 
 		Context("when start fails", func() {
 			It("returns the error", func() {
 				cmd := exec.Command("nonsense-program")
-				err := externalbuilders.RunCommand(logger, cmd)
+				err := externalbuilder.RunCommand(logger, cmd)
 				Expect(err).To(HaveOccurred())
 
 				execError, ok := err.(*exec.Error)
@@ -399,7 +399,7 @@ var _ = Describe("Externalbuilders", func() {
 		Context("when the process exits with a non-zero return", func() {
 			It("returns the exec.ExitErr for the command", func() {
 				cmd := exec.Command("false")
-				err := externalbuilders.RunCommand(logger, cmd)
+				err := externalbuilder.RunCommand(logger, cmd)
 				Expect(err).To(HaveOccurred())
 
 				exitErr, ok := err.(*exec.ExitError)
@@ -411,7 +411,7 @@ var _ = Describe("Externalbuilders", func() {
 
 	Describe("SanitizeCCIDPath", func() {
 		It("forbids the set of forbidden windows characters", func() {
-			sanitizedPath := externalbuilders.SanitizeCCIDPath(`<>:"/\|?*&`)
+			sanitizedPath := externalbuilder.SanitizeCCIDPath(`<>:"/\|?*&`)
 			Expect(sanitizedPath).To(Equal("----------"))
 		})
 	})

diff --git a/core/container/externalbuilders/instance.go → core/container/externalbuilder/instance.go b/core/container/externalbuilders/instance.go → core/container/externalbuilder/instance.go
@@ -4,7 +4,7 @@ Copyright IBM Corp. All Rights Reserved.
 SPDX-License-Identifier: Apache-2.0
 */
 
-package externalbuilders
+package externalbuilder
 
 import (
 	"os/exec"

diff --git a/...ntainer/externalbuilders/instance_test.go → ...ontainer/externalbuilder/instance_test.go b/...ntainer/externalbuilders/instance_test.go → ...ontainer/externalbuilder/instance_test.go
@@ -4,7 +4,7 @@ Copyright IBM Corp. All Rights Reserved.
 SPDX-License-Identifier: Apache-2.0
 */
 
-package externalbuilders_test
+package externalbuilder_test
 
 import (
 	"os/exec"
@@ -17,23 +17,23 @@ import (
 
 	"github.com/hyperledger/fabric/common/flogging"
 	"github.com/hyperledger/fabric/core/container/ccintf"
-	"github.com/hyperledger/fabric/core/container/externalbuilders"
+	"github.com/hyperledger/fabric/core/container/externalbuilder"
 )
 
 var _ = Describe("Instance", func() {
 	var (
 		logger   *flogging.FabricLogger
-		instance *externalbuilders.Instance
+		instance *externalbuilder.Instance
 	)
 
 	BeforeEach(func() {
 		enc := zapcore.NewConsoleEncoder(zapcore.EncoderConfig{MessageKey: "msg"})
 		core := zapcore.NewCore(enc, zapcore.AddSync(GinkgoWriter), zap.NewAtomicLevel())
 		logger = flogging.NewFabricLogger(zap.New(core).Named("logger"))
 
-		instance = &externalbuilders.Instance{
+		instance = &externalbuilder.Instance{
 			PackageID: "test-ccid",
-			Builder: &externalbuilders.Builder{
+			Builder: &externalbuilder.Builder{
 				Location: "testdata/goodbuilder",
 				Logger:   logger,
 			},
@@ -62,7 +62,7 @@ var _ = Describe("Instance", func() {
 	Describe("Stop", func() {
 		It("terminates the process", func() {
 			cmd := exec.Command("sleep", "90")
-			sess, err := externalbuilders.Start(logger, cmd)
+			sess, err := externalbuilder.Start(logger, cmd)
 			Expect(err).NotTo(HaveOccurred())
 			instance.Session = sess
 			instance.TermTimeout = time.Minute
@@ -79,7 +79,7 @@ var _ = Describe("Instance", func() {
 		Context("when the process doesn't respond to SIGTERM within TermTimeout", func() {
 			It("kills the process with malice", func() {
 				cmd := exec.Command("testdata/ignoreterm.sh")
-				sess, err := externalbuilders.Start(logger, cmd)
+				sess, err := externalbuilder.Start(logger, cmd)
 				Expect(err).NotTo(HaveOccurred())
 
 				instance.Session = sess

diff --git a/...iner/externalbuilders/metadataprovider.go → ...ainer/externalbuilder/metadataprovider.go b/...iner/externalbuilders/metadataprovider.go → ...ainer/externalbuilder/metadataprovider.go
@@ -4,7 +4,7 @@ Copyright IBM Corp. All Rights Reserved.
 SPDX-License-Identifier: Apache-2.0
 */
 
-package externalbuilders
+package externalbuilder
 
 import (
 	"archive/tar"

diff --git a/...externalbuilders/metadataprovider_test.go → .../externalbuilder/metadataprovider_test.go b/...externalbuilders/metadataprovider_test.go → .../externalbuilder/metadataprovider_test.go
@@ -4,7 +4,7 @@ Copyright IBM Corp. All Rights Reserved.
 SPDX-License-Identifier: Apache-2.0
 */
 
-package externalbuilders_test
+package externalbuilder_test
 
 import (
 	"archive/tar"
@@ -14,14 +14,14 @@ import (
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
 
-	"github.com/hyperledger/fabric/core/container/externalbuilders"
+	"github.com/hyperledger/fabric/core/container/externalbuilder"
 )
 
 var _ = Describe("Metadataprovider", func() {
-	var mp *externalbuilders.MetadataProvider
+	var mp *externalbuilder.MetadataProvider
 
 	BeforeEach(func() {
-		mp = &externalbuilders.MetadataProvider{
+		mp = &externalbuilder.MetadataProvider{
 			DurablePath: "testdata",
 		}
 	})

diff --git a/core/container/externalbuilders/session.go → core/container/externalbuilder/session.go b/core/container/externalbuilders/session.go → core/container/externalbuilder/session.go
@@ -4,7 +4,7 @@ Copyright IBM Corp. All Rights Reserved.
 SPDX-License-Identifier: Apache-2.0
 */
 
-package externalbuilders
+package externalbuilder
 
 import (
 	"bufio"