remove unnessesary docker container id truncation

Signed-off-by: hengyoush <hengyoush1@163.com>

Author: hengyoush

exec/container/controller.go

@@ -23,7 +23,6 @@ import (
 	"strconv"
 	"strings"
 
-	"github.com/chaosblade-io/chaosblade-exec-cri/exec/container"
 	"github.com/chaosblade-io/chaosblade-spec-go/util"
 	"github.com/sirupsen/logrus"
 	v1 "k8s.io/api/core/v1"
@@ -145,9 +144,6 @@ func getMatchedContainerMetaList(pods []v1.Pod, containerIdsValue, containerName
 				containerStatusErr = errors.New("containerId is empty")
 			} else {
 				containerRuntime, containerId = model.TruncateContainerObjectMetaUid(containerStatus.ContainerID)
-				if containerRuntime == container.DockerRuntime {
-					// containerId = containerId[:12]
-				}
 			}
 			if containerStatus.State.Running == nil {
 				if containerStatusErr != nil {
@@ -161,7 +157,7 @@ func getMatchedContainerMetaList(pods []v1.Pod, containerIdsValue, containerName
 					if expectedContainerId == "" {
 						continue
 					}
-					if strings.HasPrefix(containerId /*k8s中获取的*/, expectedContainerId /*用户输入的，可能为全限定*/) {
+					if strings.HasPrefix(containerId, expectedContainerId) {
 						if containerStatusErr != nil {
 							return containerObjectMetaList, spec.ResponseFailWithFlags(spec.ParameterInvalid,
 								model.ContainerIdsFlag.Name, expectedContainerId,
@@ -229,9 +225,6 @@ func getMatchedContainerMetaList(pods []v1.Pod, containerIdsValue, containerName
 					fmt.Sprintf("container: %s %s", containerStatuses[idx].Name, containerStatusErr.Error()))
 			}
 			containerRuntime, containerId := model.TruncateContainerObjectMetaUid(containerStatuses[idx].ContainerID)
-			if containerRuntime == container.DockerRuntime {
-				// containerId = containerId[:12]
-			}
 			containerObjectMetaList = append(containerObjectMetaList, model.ContainerObjectMeta{
 				ContainerRuntime: containerRuntime,
 				ContainerId:      containerId,

exec/model/executor_copy.go

@@ -412,11 +412,7 @@ func getNewContainerIdByPod(podName, podNamespace, containerName, experimentId s
 	for _, containerStatus := range containerStatuses {
 		if containerName == containerStatus.Name {
 			_, containerLongId := TruncateContainerObjectMetaUid(containerStatus.ContainerID)
-			if len(containerLongId) > 12 {
-				// return containerLongId[:12], nil
-				return containerLongId, nil
-			}
-			return "", fmt.Errorf("the container %s id is illegal", containerLongId)
+			return containerLongId, nil
 		}
 	}
 	return "", fmt.Errorf("cannot find the %s container in %s pod", containerName, podName)

exec/pod/controller.go

@@ -19,8 +19,6 @@ package pod
 import (
 	"context"
 
-	"github.com/chaosblade-io/chaosblade-exec-cri/exec/container"
-
 	"github.com/sirupsen/logrus"
 	v1 "k8s.io/api/core/v1"
 
@@ -94,9 +92,6 @@ func getContainerMatchedList(experimentId string, pods []v1.Pod) model.Container
 	containerObjectMetaList := model.ContainerMatchedList{}
 	for _, p := range pods {
 		containerId, containerName, runtime, err := model.GetOneAvailableContainerIdFromPod(p)
-		if runtime == container.DockerRuntime {
-			// containerId = containerId[:12]
-		}
 
 		if err != nil {
 			logrus.WithField("experiment", experimentId).WithField("pod", p.Name).