Develop -> main (Patch release 31.1)

Merge pull request #1041 from up9inc/develop #patch

.github/workflows/acceptance_tests.yml

@@ -8,9 +8,6 @@ on:
     branches:
       - 'develop'
 
-env:
-  MIZU_CI_IMAGE: mizu/ci:0.0
-
 jobs:
   run-acceptance-tests:
     name: Run acceptance tests
@@ -24,19 +21,6 @@ jobs:
       - name: Check out code into the Go module directory
         uses: actions/checkout@v2
 
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v1
-
-      - name: Build
-        uses: docker/build-push-action@v2
-        with:
-          context: .
-          push: false
-          load: true
-          tags: ${{ env.MIZU_CI_IMAGE }}
-          cache-from: type=gha
-          cache-to: type=gha,mode=max
-
       - name: Setup acceptance test
         run: ./acceptanceTests/setup.sh
 

.github/workflows/acceptance_tests_on_pr.yml

@@ -2,9 +2,6 @@ name: Acceptance tests on PR
 
 on: push
 
-env:
-  MIZU_CI_IMAGE: mizu/ci:0.0
-
 concurrency:
   group: acceptance-tests-on-pr-${{ github.ref }}
   cancel-in-progress: true
@@ -24,19 +21,6 @@ jobs:
       - name: Check out code into the Go module directory
         uses: actions/checkout@v2
 
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v1
-
-      - name: Build
-        uses: docker/build-push-action@v2
-        with:
-          context: .
-          push: false
-          load: true
-          tags: ${{ env.MIZU_CI_IMAGE }}
-          cache-from: type=gha
-          cache-to: type=gha,mode=max
-
       - name: Setup acceptance test
         run: ./acceptanceTests/setup.sh
 

acceptanceTests/setup.sh

@@ -57,16 +57,11 @@ kubectl expose deployment rabbitmq --type=LoadBalancer --port=5672 -n mizu-tests
 echo "Starting proxy"
 kubectl proxy --port=8080 &
 
-if [[ -z "${CI}" ]]; then
-  echo "Setting env var of mizu ci image"
-  export MIZU_CI_IMAGE="mizu/ci:0.0"
-  echo "Build agent image"
-  docker build -t "${MIZU_CI_IMAGE}" .
-else
-  echo "not building docker image in CI because it is created as separate step"
-fi
+echo "Setting minikube docker env"
+eval $(minikube docker-env)
 
-minikube image load "${MIZU_CI_IMAGE}"
+echo "Build agent image"
+docker build -t mizu/ci:0.0 .
 
 echo "Build cli"
 cd cli && make build GIT_BRANCH=ci SUFFIX=ci

acceptanceTests/testsUtils.go

@@ -212,10 +212,9 @@ func DeleteKubeFile(kubeContext string, namespace string, filename string) error
 }
 
 func getDefaultCommandArgs() []string {
-	agentImageValue := os.Getenv("MIZU_CI_IMAGE")
 	setFlag := "--set"
 	telemetry := "telemetry=false"
-	agentImage := fmt.Sprintf("agent-image=%s", agentImageValue)
+	agentImage := "agent-image=mizu/ci:0.0"
 	imagePullPolicy := "image-pull-policy=IfNotPresent"
 	headless := "headless=true"
 

tap/tlstapper/tls_poller.go

@@ -6,7 +6,6 @@ import (
 	"fmt"
 	"net"
 	"sync"
-	"time"
 
 	"encoding/binary"
 	"encoding/hex"
@@ -166,13 +165,9 @@ func (p *tlsPoller) startNewTlsReader(chunk *tlsChunk, ip net.IP, port uint16, k
 func dissect(extension *api.Extension, reader *tlsReader, isRequest bool, tcpid *api.TcpID,
 	tlsEmitter *tlsEmitter, options *api.TrafficFilteringOptions, reqResMatcher api.RequestResponseMatcher) {
 	b := bufio.NewReader(reader)
-	
-	timer := api.SuperTimer{
-		CaptureTime: time.Now(),
-	}
 
 	err := extension.Dissector.Dissect(b, reader.progress, api.Ebpf, isRequest, tcpid, &api.CounterPair{},
-		&timer, &api.SuperIdentifier{}, tlsEmitter, options, reqResMatcher)
+		&api.SuperTimer{}, &api.SuperIdentifier{}, tlsEmitter, options, reqResMatcher)
 
 	if err != nil {
 		logger.Log.Warningf("Error dissecting TLS %v - %v", tcpid, err)