fix: support create chaincode 2.0

Author: finefine

internal/peitho/controller/container/ping.go

@@ -6,12 +6,10 @@ package container
 
 import (
 	"github.com/gin-gonic/gin"
-
-	"github.com/tianrandailove/peitho/pkg/log"
 )
 
 func (cc *ContainerController) Ping(c *gin.Context) {
-	log.L(c).Info("ping function called.")
+	//log.L(c).Info("ping function called.")
 
 	c.JSON(200, gin.H{"message": "OK"})
 }

internal/peitho/router.go

@@ -6,7 +6,6 @@ package peitho
 
 import (
 	"github.com/gin-gonic/gin"
-
 	"github.com/tianrandailove/peitho/internal/peitho/controller/container"
 	"github.com/tianrandailove/peitho/internal/peitho/controller/image"
 	"github.com/tianrandailove/peitho/internal/peitho/service"

internal/peitho/run.go

@@ -30,7 +30,9 @@ func Run(cfg *config.Config) error {
 	// new service
 	service.Srv = service.NewService(dockerService, k8sService)
 
-	engine := gin.Default()
+	engine := gin.New()
+	engine.Use(gin.LoggerWithConfig(gin.LoggerConfig{SkipPaths: []string{"/_ping"}}))
+
 	initRouter(engine)
 
 	return engine.Run()

internal/peitho/service/container.go

@@ -201,7 +201,7 @@ func (cs *containerService) Upload(ctx context.Context, containerID string, path
 		ctx = context.WithValue(ctx, "version", "v2.0.0")
 	}
 	// update chaincode deployment
-	if err := cs.k8s.UpdateDeployment(context.WithValue(ctx, "version", "v2.0.0"), name); err != nil {
+	if err := cs.k8s.UpdateDeployment(ctx, name); err != nil {
 		return err
 	}
 

internal/peitho/service/image.go

@@ -14,6 +14,7 @@ import (
 	"io"
 	"io/ioutil"
 	"strings"
+	"sync"
 	"time"
 )
 
@@ -40,18 +41,21 @@ type ImageSrv interface {
 
 type imageService struct {
 	docker docker.DockerService
+	lock   sync.Mutex
 }
 
 var _ ImageSrv = (*imageService)(nil)
 
 func newImage(srv *service) *imageService {
 	return &imageService{
 		docker: srv.docker,
+		lock:   sync.Mutex{},
 	}
 }
 
 // Build build an image and push it to registry
-func (i imageService) Build(ctx context.Context, dockerfile string, tags []string, content io.Reader) (io.ReadCloser, error) {
+func (i *imageService) Build(ctx context.Context, dockerfile string, tags []string, content io.Reader) (io.ReadCloser, error) {
+
 	imageOptions := types.ImageBuildOptions{
 		Dockerfile: dockerfile,
 		Tags:       tags,
@@ -65,6 +69,8 @@ func (i imageService) Build(ctx context.Context, dockerfile string, tags []strin
 		return nil, errors.New("content is nil")
 	}
 
+	// lock
+	i.lock.Lock()
 	resp, err := i.docker.ImageBuild(ctx, content, imageOptions)
 	if err != nil {
 		log.Errorf("build image failed: %v", err)
@@ -80,6 +86,10 @@ func (i imageService) Build(ctx context.Context, dockerfile string, tags []strin
 		}
 		time.Sleep(1 * time.Second)
 	}
+
+	// release lock
+	i.lock.Unlock()
+
 	log.Infof("build image %s complete", tags[0])
 	log.Infof("ready push")
 
@@ -128,7 +138,7 @@ func (i imageService) Build(ctx context.Context, dockerfile string, tags []strin
 }
 
 // Create pull a image
-func (i imageService) Create(ctx context.Context, fromImage string) (io.ReadCloser, error) {
+func (i *imageService) Create(ctx context.Context, fromImage string) (io.ReadCloser, error) {
 	resp, err := i.docker.ImagePull(ctx, fromImage, types.ImagePullOptions{})
 	if err != nil {
 		log.Errorf("pull image failed: %v", err)
@@ -140,7 +150,7 @@ func (i imageService) Create(ctx context.Context, fromImage string) (io.ReadClos
 }
 
 // Inspect inspect image information
-func (i imageService) Inspect(ctx context.Context, imageID string) (interface{}, error) {
+func (i *imageService) Inspect(ctx context.Context, imageID string) (interface{}, error) {
 	if !strings.HasPrefix(imageID, i.docker.GetServerAddress()) {
 		// for chiancode, pull it firstly then inspect
 		imageID = fmt.Sprintf("%s/%s/%s", i.docker.GetServerAddress(), i.docker.GetProjectName(), imageID)
@@ -170,7 +180,7 @@ func (i imageService) Inspect(ctx context.Context, imageID string) (interface{},
 }
 
 // AddTag add a new tag for image
-func (i imageService) AddTag(ctx context.Context, imageTag, newTag string) error {
+func (i *imageService) AddTag(ctx context.Context, imageTag, newTag string) error {
 	if err := i.docker.ImageTag(ctx, imageTag, newTag); err != nil {
 		log.Errorf("add tag failed: %v", err)
 
@@ -181,7 +191,7 @@ func (i imageService) AddTag(ctx context.Context, imageTag, newTag string) error
 }
 
 // Push push a image
-func (i imageService) Push(ctx context.Context, imageTag string) (io.ReadCloser, error) {
+func (i *imageService) Push(ctx context.Context, imageTag string) (io.ReadCloser, error) {
 	auth, err := i.docker.RegistryAuth()
 	if err != nil {
 		log.Errorf("get RegistryAuth failed: %v", err)

internal/peitho/util/container_util.go

@@ -41,48 +41,3 @@ func GetDeploymentName(ID string) string {
 
 	return fmt.Sprintf("chaincode-%s-%s", ID[:10], hex.EncodeToString(digest))
 }
-
-// GetDeploymentName get a valid deployment name
-func GetDeploymentName(ID string) string {
-	if len(ID) <= 53 {
-
-		return strings.ReplaceAll(ID, ".", "-")
-	}
-
-	ID = strings.ReplaceAll(ID, ".", "-")
-	hasher := md5.New()
-	hasher.Write([]byte(ID))
-	digest := hasher.Sum(nil)
-
-	return fmt.Sprintf("chaincode-%s-%s", ID[:10], hex.EncodeToString(digest))
-}
-
-// GetDeploymentName get a valid deployment name
-func GetDeploymentName(ID string) string {
-	if len(ID) <= 53 {
-
-		return strings.ReplaceAll(ID, ".", "-")
-	}
-
-	ID = strings.ReplaceAll(ID, ".", "-")
-	hasher := md5.New()
-	hasher.Write([]byte(ID))
-	digest := hasher.Sum(nil)
-
-	return fmt.Sprintf("chaincode-%s-%s", ID[:10], hex.EncodeToString(digest))
-}
-
-// GetDeploymentName get a valid deployment name
-func GetDeploymentName(ID string) string {
-	if len(ID) <= 53 {
-
-		return strings.ReplaceAll(ID, ".", "-")
-	}
-
-	ID = strings.ReplaceAll(ID, ".", "-")
-	hasher := md5.New()
-	hasher.Write([]byte(ID))
-	digest := hasher.Sum(nil)
-
-	return fmt.Sprintf("chaincode-%s-%s", ID[:10], hex.EncodeToString(digest))
-}