Client gen refactor (#1159)

* Move generated files to a common location under `/api/generated`
(Instead of duplicating cli and frontend).
* Update `k8s.io/code-generator` to v0.30.0
* Add generation of the above files to CI and ensure it is up to date.
* Update e2e-test for Java in verify.bats

.github/workflows/e2e/bats/utilities.bash

@@ -153,8 +153,7 @@ assert_regex() {
 }
 
 assert_not_empty() {
-	EMPTY=(\"\")
-	if [[ "$1" == "${EMPTY}" ]]; then
+	if [[ -z "$1" ]]; then
 		{
 			echo
 			echo "-- 💥 value is empty 💥 --"

.github/workflows/e2e/bats/verify.bats

@@ -138,9 +138,9 @@ JS_SCOPE="@opentelemetry/instrumentation-http"
 }
 
 @test "client, server :: spans have same trace ID" {
-  client_trace_id=$(server_spans_from_scope_named ${JAVA_CLIENT_SCOPE} | jq ".traceId")
+  client_trace_id=$(client_spans_from_scope_named ${JAVA_CLIENT_SCOPE} | jq ".traceId" | uniq)
   assert_not_empty "$client_trace_id"
-  server_trace_id=$(client_spans_from_scope_named ${JAVA_SCOPE} | jq ".traceId")
+  server_trace_id=$(server_spans_from_scope_named ${JAVA_SCOPE} | jq ".traceId" | uniq)
   assert_not_empty "$server_trace_id"
   assert_equal "$server_trace_id" "$client_trace_id"
 }

.github/workflows/verify-api-crds.yml

@@ -25,3 +25,12 @@ jobs:
             echo "api CRDs are not up to date. Please run 'make generate && make manifests' and commit the changes."
             exit 1
           fi
+      - name: Generate client files
+        run: make generate-client
+      - name: Verify Generate
+        run: |
+          if [[ $(git diff --exit-code) ]]; then
+            git diff
+            echo "client files are not up to date. Please run 'make generate-client' and commit the changes."
+            exit 1
+          fi

api/DEVELOPMENT.md

@@ -5,7 +5,8 @@
 1. Update the relevant CRD `go` file in the `api/odigos` directory.
 2. Run `make generate` to update the auto generated `zz_generated.deepcopy.go` file.
 3. Run `make manifests` to update the CRD yaml files in the `config/crd/bases` directory.
-4. Update the code in `cli` module to reflect the changes in the CRD in the `cli/cmd/resources/crds` directory
+4. Run `make generate-client` to update the auto generated files under `api/generated`.
+5. Update the code in `cli` module to reflect the changes in the CRD in the `cli/cmd/resources/crds` directory
 
 ## CRD versioning
 

api/Makefile

@@ -84,3 +84,9 @@ $(CONTROLLER_GEN): $(LOCALBIN)
 envtest: $(ENVTEST) ## Download envtest-setup locally if necessary.
 $(ENVTEST): $(LOCALBIN)
 	GOBIN=$(LOCALBIN) go install sigs.k8s.io/controller-runtime/tools/setup-envtest@latest
+
+.PHONY: generate-client
+generate-client:
+	GOWORK=off go mod vendor
+	./hack/update-codegen.sh
+	rm -rf ./vendor