Fix bug where cli manifests with AT_DARWIN_ARM64 ArtifactTypes fail…

… to parse (pixie-io#2005) Summary: Fix bug where cli manifests with `AT_DARWIN_ARM64` ArtifactTypes fail to parse This was an error I ran into when testing pixie-io#1997. You can see the failure output from the [following build](https://github.com/pixie-io/pixie/actions/runs/10705210930/job/29681122220?pr=1997) (also copied below). ``` INFO: Running command line: bazel-bin/src/utils/artifacts/manifest_updater/manifest_updater_/manifest_updater '--manifest_updates=/__w/pixie/pixie/manifest_updates.json' '--manifest_path=/__w/pixie/pixie/gh-pages/artifacts/manifest.json' time="2024-09-04T16:17:53Z" level=fatal msg="failed to read manifest updates" error="unknown value \"AT_DARWIN_ARM64\" for enum px.versions.ArtifactType" ``` Relevant Issues: pixie-io#1993 Type of change: /kind bugfix Test Plan: Built the manifest_updater binary and verified it no longer fails with a parse error ``` $ ./manifest_updater --manifest_updates manifest_updates.json --manifest_path=manifest.json $ ``` --------- Signed-off-by: Dom Del Nano <[email protected]> GitOrigin-RevId: afffb8e
ddelnano · Sep 4, 2024 · 3ec114b · 3ec114b
1 parent 59c35e8
commit 3ec114b
Show file tree

Hide file tree

Showing 4 changed files with 46 additions and 39 deletions.
diff --git a/.arclint b/.arclint
@@ -15,7 +15,9 @@
     "(^k8s/devinfra/prow/prowjob_customresourcedefinition.yaml$)",
     "(^k8s/operator/crd/base/px\\.dev_viziers\\.yaml$)",
     "(^private/users/)",
-    "(^private\/.*\\.yaml)",
+    "(^private\/credentials\/.*\\.sh)",
+    "(^private\/credentials\/.*\\.sh)",
+    "(^private\/credentials\/.*\\.yaml)",
     "(^src/operator/client/versioned/)",
     "(^src/operator/apis/px.dev/v1alpha1/zz_generated.deepcopy.go)",
     "(^src/stirling/bpf_tools/bcc_bpf/system-headers)",

diff --git a/ci/bazel_build_deps.sh b/ci/bazel_build_deps.sh
@@ -133,7 +133,7 @@ function compute_targets() {
     fi
   done
 
-  targets+=("rdeps(//..., set(${changed_files[*]}))")
+  targets+=("rdeps(//..., set(${changed_files[*]}))  intersect //...")
 }
 
 function check_bpf_trigger() {

diff --git a/src/shared/artifacts/versionspb/versions.pb.go b/src/shared/artifacts/versionspb/versions.pb.go
diff --git a/src/shared/artifacts/versionspb/versions.proto b/src/shared/artifacts/versionspb/versions.proto
@@ -30,6 +30,7 @@ enum ArtifactType {
   AT_UNKNOWN = 0;
   AT_LINUX_AMD64 = 1;
   AT_DARWIN_AMD64 = 2;
+  AT_DARWIN_ARM64 = 3;
   AT_CONTAINER_SET_YAMLS = 50;
   AT_CONTAINER_SET_TEMPLATE_YAMLS = 60;
   AT_CONTAINER_SET_LINUX_AMD64 = 100;
-Original file line number
+Diff line change
@@ Expand Up / @@ -133,7 +133,7 @@ function compute_targets() { @@
         fi
       done
-      targets+=("rdeps(//..., set(${changed_files[*]}))")
+      targets+=("rdeps(//..., set(${changed_files[*]}))  intersect //...")
     }
     function check_bpf_trigger() {
@@ Expand Down @@