fix validation CI

Signed-off-by: Humair Khan <HumairAK@users.noreply.github.com>

Author: HumairAK

.github/actions/kfp-k8s/action.yml

@@ -4,6 +4,10 @@ inputs:
     required: true
     default: "1.2.2"
     description: "build package version"
+  generate_golang_proto:
+    required: true
+    default: "false"
+    description: "optionally generate golang proto files"
 runs:
   using: "composite"
   steps:
@@ -18,16 +22,23 @@ runs:
       run: |
         python -m build .
 
-    - name: Generate kfp-kubernetes proto files from source
+    - name: Generate kfp-kubernetes python proto files from source
       id: generate-kfp-kubernetes-proto-files
       shell: bash
       if: ${{ steps.install-kfp.outcome == 'success' }}
       working-directory: ./kubernetes_platform
       run: make clean python USE_FIND_LINKS=true
 
+    - name: Generate kfp-kubernetes golang proto files from source
+      id: generate-kfp-kubernetes-go-proto-files
+      shell: bash
+      if: ${{ steps.install-kfp.outcome == 'success' && inputs.generate_golang_proto == 'true' }}
+      working-directory: ./kubernetes_platform
+      run: make golang
+
     # kfp is installed transitively
     # --find-links ensures pip first looks in the sdk/python/dist folder
-    # outputted from install-kfp step before looking at pypi
+    # outputted from generate-kfp-kubernetes-proto-files step before looking at pypi
     - name: Install kfp & kfp-kubernetes from source
       id: install-kfp-kubernetes
       shell: bash

.github/actions/protobuf/action.yml

@@ -16,6 +16,10 @@ inputs:
     required: true
     default: "0.42.0"
     description: "wheels python package version"
+  generate_golang_proto:
+    required: true
+    default: "false"
+    description: "optionally generate golang proto files"
 runs:
   using: "composite"
   steps:
@@ -53,6 +57,13 @@ runs:
       run: |
         pip install api/v2alpha1/python/dist/*.whl
 
+    - name: Generate kfp-pipeline-spec golang files
+      if: ${{ inputs.generate_golang_proto == 'true' }}
+      working-directory: ./api
+      shell: bash
+      run: |
+        make golang
+
     - name: Summary
       shell: bash
       run: |

.github/workflows/validate-generated-files.yml

@@ -38,19 +38,18 @@ jobs:
         uses: actions/setup-python@v4
         with:
           python-version: 3.9
-      
-      - name: Install Dependencies
-        run: |
-          sudo apt-get update && sudo apt-get install -y protobuf-compiler jq default-jdk
-          python3 -m pip install setuptools wheel
 
-      - name: Generate API proto files
-        working-directory: ./api
-        run: make clean all
-  
-      - name: Generate kfp-kubernetes proto files from source
-        working-directory: ./kubernetes_platform
-        run: make clean all
+      - name: Install protobuf dependencies & kfp-pipeline-spec
+        id: install-protobuf-deps
+        uses: ./.github/actions/protobuf
+        with:
+          generate_golang_proto: "true"
+
+      - name: Install kfp & kfp-kubernetes from source
+        id: install-kfp-k8s-deps
+        uses: ./.github/actions/kfp-k8s
+        with:
+          generate_golang_proto: "true"
 
       - name: Generate K8s Native API CRDs
         working-directory: ./backend/src/crd/kubernetes

api/Makefile

@@ -60,6 +60,7 @@ clean-python:
 	rm -rf v2alpha1/python/build
 	rm -rf v2alpha1/python/dist
 	rm -rf v2alpha1/python/kfp_pipeline_spec.egg-info
+	rm -rf v2alpha1/google
 	rm -f v2alpha1/python/kfp/pipeline_spec/pipeline_spec_pb2.py
 	rm -f v2alpha1/google/rpc/status.proto