Merge branch 'main' into dependabot/go_modules/engine/server/google.g…

…olang.org/grpc-1.56.3
kurtosis-tech · Nov 17, 2023 · aa03a4b · aa03a4b
2 parents 815dabd + b558d38
commit aa03a4b
Show file tree

Hide file tree

Showing 356 changed files with 7,845 additions and 3,272 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -131,7 +131,7 @@ executors:
     machine:
       # This custom CircleCi Ubuntu image has a pre-installed Docker, so we are not using the CircleCI remote Docker when we
       # initiate this machine. More here: https://discuss.circleci.com/t/linux-machine-executor-images-2022-january-q1-update/42831
-      image: ubuntu-2004:2023.07.1
+      image: ubuntu-2004:2023.10.1
 
 parameters:
   go-version:
@@ -268,6 +268,15 @@ jobs:
       - <<: *abort_job_if_only_docs_changes
       - run: grpc-file-transfer/scripts/build.sh
 
+  build_metrics_library:
+    docker:
+      - image: "cimg/go:<< pipeline.parameters.go-version>>"
+    steps:
+      - checkout
+      - <<: *abort_job_if_only_docs_changes
+      - run: metrics-library/scripts/build.sh
+
+
   build_name_generator:
     docker:
       - image: "cimg/go:<< pipeline.parameters.go-version>>"
@@ -504,7 +513,7 @@ jobs:
       - when:
           condition:
             and:
-               - equal: [ "kubernetes", << parameters.cli-cluster-backend >> ]
+              - equal: [ "kubernetes", << parameters.cli-cluster-backend >> ]
           <<: *steps_prepare_testing_k8s_k3s
 
       - when:
@@ -781,13 +790,18 @@ jobs:
       # Execute port print
       - run: "${KURTOSIS_BINPATH} port print test-datastore datastore-0 grpc"
 
-      # Execute docker compose import
-      - run: "${KURTOSIS_BINPATH} import --enclave test-import --env << pipeline.parameters.dockerimport-cli-dotenv-relative-path >> << pipeline.parameters.dockerimport-cli-dockerfile-relative-path >>"
-
+      # Stop test-datastore enclave
+      - run: "${KURTOSIS_BINPATH} enclave stop test-datastore"
 
+      # Ensure we can still inspect stopped enclaves
       - run: "${KURTOSIS_BINPATH} enclave stop test-enclave"
-      - run: "${KURTOSIS_BINPATH} enclave stop test-datastore"
-      - run: "${KURTOSIS_BINPATH} enclave inspect test-enclave"   # Ensure we can still inspect stopped enclaves
+      - run: "${KURTOSIS_BINPATH} enclave inspect test-enclave"
+
+      # Clean all before compose import to free resources
+      - run: "${KURTOSIS_BINPATH} clean -a"
+
+      # Execute docker compose import
+      - run: "${KURTOSIS_BINPATH} import --enclave test-import --env << pipeline.parameters.dockerimport-cli-dotenv-relative-path >> << pipeline.parameters.dockerimport-cli-dockerfile-relative-path >>"
 
       # Execute engine functions
       - run: "${KURTOSIS_BINPATH} engine stop"
@@ -815,7 +829,7 @@ jobs:
                   docker container restart $(echo $apic_container_id)
                   ${KURTOSIS_BINPATH} service rm test-apic-restart service-test
 
-       # Test APIC idempotent runs restart
+      # Test APIC idempotent runs restart
       - when:
           condition:
             equal: [ "docker", << parameters.cli-cluster-backend >> ]
@@ -1182,6 +1196,12 @@ workflows:
               ignore:
                 - main
 
+      - build_metrics_library:
+          filters:
+            branches:
+              ignore:
+                - main
+
       - build_name_generator:
           filters:
             branches:

diff --git a/.envrc b/.envrc
@@ -0,0 +1 @@
+use flake
diff --git a/.github/workflows/golangci-lint.yml b/.github/workflows/golangci-lint.yml
@@ -52,6 +52,13 @@ jobs:
           working-directory: grpc-file-transfer/golang/
           args: --timeout=3m
           skip-pkg-cache: true
+      - name: lint-metrics-library
+        uses: golangci/golangci-lint-action@v3
+        with:
+          version: ${{ env.GOLINT_VERSION }}
+          working-directory: metrics-library/golang
+          args: --timeout=3m
+          skip-pkg-cache: true
       - name: lint-name-generator
         uses: golangci/golangci-lint-action@v3
         with:

diff --git a/.github/workflows/push-docs.yml b/.github/workflows/push-docs.yml
@@ -45,12 +45,6 @@ jobs:
       - name: Append changelog
         run: cat CHANGELOG.md >> docs/docs/changelog.md
         if: github.ref == 'refs/heads/main' || steps.docs-diff.outputs.DOCS_CHANGED != 0
-      - name: Append Go README
-        run: cat api/golang/README.md >> docs/docs/sdk-examples/go-sdk-example.md
-        if: github.ref == 'refs/heads/main' || steps.docs-diff.outputs.DOCS_CHANGED != 0
-      - name: Append TS README
-        run: cat api/typescript/README.md >> docs/docs/sdk-examples/ts-sdk-example.md
-        if: github.ref == 'refs/heads/main' || steps.docs-diff.outputs.DOCS_CHANGED != 0
       - name: Yarn Install
         run: yarn --cwd ./docs --frozen-lockfile install
         if: github.ref == 'refs/heads/main' || steps.docs-diff.outputs.DOCS_CHANGED != 0
@@ -70,7 +64,10 @@ jobs:
   reindex-website-main:
     runs-on: ubuntu-latest
     name: Update website search index via Algolia Crawler
-    if: github.ref == 'refs/heads/main'
+    if: ${{
+      github.event_name == 'push' &&
+      github.ref == 'refs/heads/main'
+      }}
     steps:
       - uses: fjogeleit/http-request-action@v1
         with:
@@ -80,27 +77,30 @@ jobs:
           password: ${{ secrets.ALGOLIA_CRAWLER_API_KEY }}
           customHeaders: '{"Content-Type": "application/json"}'
     needs: publish
-  check-index:
-    runs-on: ubuntu-latest
-    name: Checks that the latest index is still working
-    if: github.ref == 'refs/heads/main'
-    steps:
-      - uses: fjogeleit/http-request-action@v1
-        id: search
-        with:
-          url: "https://NTSX40VZB8-dsn.algolia.net/1/indexes/kurtosis/query"
-          method: 'POST'
-          customHeaders: '{"X-Algolia-API-Key": "4269c726c2fea4e6cddfeb9a21cd3d4e", "X-Algolia-Application-Id": "NTSX40VZB8"}'
-          data: '{ "params": "query=add_service&hitsPerPage=2&getRankingInfo=1" }'
-      - name: Show Response
-        run: |
-          #!/bin/bash
-          set -eou pipefail
+  # check-index:
+  #   runs-on: ubuntu-latest
+  #   name: Checks that the latest index is still working
+  #   if: ${{
+  #     github.event_name == 'push' &&
+  #     github.ref == 'refs/heads/main'
+  #     }}
+  #   steps:
+  #     - uses: fjogeleit/http-request-action@v1
+  #       id: search
+  #       with:
+  #         url: "https://NTSX40VZB8-dsn.algolia.net/1/indexes/kurtosis/query"
+  #         method: 'POST'
+  #         customHeaders: '{"X-Algolia-API-Key": "4269c726c2fea4e6cddfeb9a21cd3d4e", "X-Algolia-Application-Id": "NTSX40VZB8"}'
+  #         data: '{ "params": "query=add_service&hitsPerPage=2&getRankingInfo=1" }'
+  #     - name: Show Response
+  #       run: |
+  #         #!/bin/bash
+  #         set -eou pipefail
 
-          if (( ${{ fromJson(steps.search.outputs.response).nbHits }} > 100 )); then
-            echo "Results are greater than 100"
-          else
-            echo "Results are not greater than 100"
-            exit 1
-          fi
-    needs: reindex-website-main
+  #         if (( ${{ fromJson(steps.search.outputs.response).nbHits }} > 100 )); then
+  #           echo "Results are greater than 100"
+  #         else
+  #           echo "Results are not greater than 100"
+  #           exit 1
+  #         fi
+  #   needs: reindex-website-main
diff --git a/.gitignore b/.gitignore
@@ -120,3 +120,6 @@ Cargo.lock
 
 # MSVC Windows builds of rustc generate these, which store debugging information
 *.pdb
+
+# direnv files
+.direnv
-Original file line number
+Diff line change
@@ Expand Up / @@ -120,3 +120,6 @@ Cargo.lock @@
     # MSVC Windows builds of rustc generate these, which store debugging information
     *.pdb
+    # direnv files
+    .direnv