Develop -> main (Release 31.0)

Merge pull request #1036 from up9inc/develop #major

.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"
@@ -131,7 +130,6 @@ func (p *tlsPoller) handleTlsChunk(chunk *tlsChunk, extension *api.Extension,
 		p.readers[key] = reader
 	}
 
-	reader.timer.CaptureTime = time.Now()
 	reader.chunks <- chunk
 
 	if os.Getenv("MIZU_VERBOSE_TLS_TAPPER") == "true" {
@@ -151,9 +149,6 @@ func (p *tlsPoller) startNewTlsReader(chunk *tlsChunk, ip net.IP, port uint16, k
 			p.closeReader(key, r)
 		},
 		progress: &api.ReadProgress{},
-		timer: api.SuperTimer{
-			CaptureTime: time.Now(),
-		},
 	}
 
 	tcpid := p.buildTcpId(chunk, ip, port)
@@ -172,7 +167,7 @@ func dissect(extension *api.Extension, reader *tlsReader, isRequest bool, tcpid
 	b := bufio.NewReader(reader)
 
 	err := extension.Dissector.Dissect(b, reader.progress, api.Ebpf, isRequest, tcpid, &api.CounterPair{},
-		&reader.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)

tap/tlstapper/tls_reader.go

@@ -13,7 +13,6 @@ type tlsReader struct {
 	data        []byte
 	doneHandler func(r *tlsReader)
 	progress    *api.ReadProgress
-	timer        api.SuperTimer
 }
 
 func (r *tlsReader) Read(p []byte) (int, error) {

ui-common/src/components/ServiceMapModal/ServiceMapModal.tsx

@@ -117,32 +117,31 @@ export const ServiceMapModal: React.FC<ServiceMapModalProps> = ({ isOpen, onClos
         .sort((a, b) => { return a.key.localeCompare(b.key) });
 
     const getServicesForFilter = useMemo(() => {
+
         const resolved = mapToKeyValForFilter(serviceMapApiData.nodes?.filter(x => x.resolved))
         const unResolved = mapToKeyValForFilter(serviceMapApiData.nodes?.filter(x => !x.resolved))
         return [...resolved, ...unResolved]
     }, [serviceMapApiData])
 
-    useEffect(() => {
+    const filterServiceMap = useCallback((newProtocolsFilters?: any[], newServiceFilters?: string[]) => {
+        const filterProt = newProtocolsFilters || checkedProtocols
+        const filterService = newServiceFilters || checkedServices
+        setCheckedProtocols(filterProt)
+        setCheckedServices(filterService)
         const newGraphData: GraphData = {
-            nodes: serviceMapApiData.nodes?.map(mapNodesDatatoGraph).filter(node => checkedServices.includes(node.label)),
-            edges: serviceMapApiData.edges?.filter(edge => checkedProtocols.includes(edge.protocol.abbr)).map(mapEdgesDatatoGraph)
+            nodes: serviceMapApiData.nodes?.map(mapNodesDatatoGraph).filter(node => filterService.includes(node.label)),
+            edges: serviceMapApiData.edges?.filter(edge => filterProt.includes(edge.protocol.abbr)).map(mapEdgesDatatoGraph)
         }
         setGraphData(newGraphData);
-    }, [checkedServices, checkedProtocols, serviceMapApiData])
+    }, [checkedProtocols, checkedServices, serviceMapApiData])
 
-    const onProtocolsChange = (newProtocolsFiltersnewProt) => {
-        const filterProt = newProtocolsFiltersnewProt || checkedProtocols
-        setCheckedProtocols(filterProt)
-    }
 
-    const onServiceChanges = (newServiceFilters) => {
-        const filterService = newServiceFilters || checkedServices
-        setCheckedServices([...filterService])
-    }
 
     useEffect(() => {
-        if (checkedServices.length == 0)
-            setCheckedServices(getServicesForFilter.map(x => x.key).filter(serviceName => !Utils.isIpAddress(serviceName)))
+        if (checkedServices.length > 0)
+            filterServiceMap()
+        else
+            filterServiceMap(checkedProtocols, getServicesForFilter.map(x => x.key).filter(serviceName => !Utils.isIpAddress(serviceName)))
     }, [getServicesForFilter])
 
     useEffect(() => {
@@ -178,14 +177,14 @@ export const ServiceMapModal: React.FC<ServiceMapModalProps> = ({ isOpen, onClos
                                 <div className={styles.filterWrapper}>
                                     <div className={styles.protocolsFilterList}>
                                         <SelectList items={protocols} checkBoxWidth="5%" tableName={"Protocols"} multiSelect={true}
-                                            checkedValues={checkedProtocols} setCheckedValues={onProtocolsChange} tableClassName={styles.filters} />
+                                            checkedValues={checkedProtocols} setCheckedValues={filterServiceMap} tableClassName={styles.filters} />
                                     </div>
                                     <div className={styles.separtorLine}></div>
                                     <div className={styles.servicesFilter}>
                                         <input className={commonClasses.textField + ` ${styles.servicesFilterSearch}`} placeholder="search service" value={servicesSearchVal} onChange={(event) => setServicesSearchVal(event.target.value)} />
                                         <div className={styles.servicesFilterList}>
                                             <SelectList items={getServicesForFilter} tableName={"Services"} tableClassName={styles.filters} multiSelect={true} searchValue={servicesSearchVal}
-                                                checkBoxWidth="5%" checkedValues={checkedServices} setCheckedValues={onServiceChanges} />
+                                                checkBoxWidth="5%" checkedValues={checkedServices} setCheckedValues={(newServicesForFilter) => filterServiceMap(null, newServicesForFilter)} />
                                         </div>
                                     </div>
                                 </div>