wip

pedjak · pedjak · commit 72fd9535b087 · 2023-11-23T17:21:44.000+01:00
diff --git a/.github/workflows/diff.yaml b/.github/workflows/diff.yaml
@@ -1,6 +1,6 @@
 on:
   pull_request:
-    branches: [main]
+#    branches: [main]
 
 name: Crossplane Dynamic Diff
 
@@ -9,216 +9,7 @@ jobs:
     name: prepare
     runs-on: ubuntu-latest
     steps:
-      - name: Setup QEMU
-        uses: docker/setup-qemu-action@v2
+      - name: diff
+        uses: pedjak/crossplane-diff-action@action
         with:
-          platforms: all 
-      - name: Check out current commit
-        uses: actions/checkout@v4
-      - name: Install Go
-        uses: actions/setup-go@v4
-      - name: Install yq
-        run: |
-          sudo add-apt-repository ppa:rmescandon/yq
-          sudo apt-get update
-          sudo apt-get install yq
-      - name: Install Crossplane CLI
-        run: go install github.com/crossplane/crossplane/cmd/crank@latest
-
-      # Discover YAML files and their annotations
-      - name: Discover YAML files
-        run: |
-          EXAMPLES_PATH="examples"
-          YAML_FILES=($(find $EXAMPLES_PATH -type f -name '*.yaml'))
-          INPUT_FILES=""
-          for file in "${YAML_FILES[@]}"; do
-            COMPOSITION=$(yq eval '.metadata.annotations."crossplane.io/render-composition-path"' $file)
-            FUNCTION=$(yq eval '.metadata.annotations."crossplane.io/render-function-path"' $file)
-
-            # Skip files where both annotations are null
-            if [[ "$COMPOSITION" == "null" && "$FUNCTION" == "null" ]]; then
-              continue
-            fi
-
-            INPUT_FILES+="$file,$COMPOSITION,$FUNCTION "
-          done
-          echo "INPUT_FILES=${INPUT_FILES}" >> $GITHUB_ENV
-
-      # Run a dynamic job for each input file
-      - name: Run Dynamic Jobs
-        run: |
-          IFS=' ' read -ra INPUT_FILES <<< "${{ env.INPUT_FILES }}"
-          for files in "${INPUT_FILES[@]}"; do
-            IFS=',' read -ra FILE_ARRAY <<< "$files"
-            FILE="${FILE_ARRAY[0]}"
-            COMPOSITION="${FILE_ARRAY[1]}"
-            FUNCTION="${FILE_ARRAY[2]}"
-
-            # Skip files where both annotations are null
-            if [[ "$COMPOSITION" == "null" && "$FUNCTION" == "null" ]]; then
-              continue
-            fi
-
-            crank beta render $FILE $COMPOSITION $FUNCTION >> diff-pr-${FILE//\//-}.yaml
-          done
-
-      - name: Install Python
-        uses: actions/setup-python@v4
-
-      # Sort YAML files
-      - name: Sort YAML files
-        run: |
-          for file in diff-pr-*.yaml; do
-            python3 -c "import yaml; data = list(yaml.load_all(open('$file'), Loader=yaml.FullLoader)); data.sort(key=lambda x: (x.get('kind', ''), str(x.get('metadata', {}).get('annotations', '')))); yaml.dump_all(data, open('$file', 'w'), default_flow_style=False)"
-          done
-
-      # Store outputs as artifacts
-      - name: Store outputs
-        uses: actions/upload-artifact@v3
-        with:
-          name: diff-pr-${{ github.sha }}
-          path: diff-*.yaml
-
-  main:
-    name: diff
-    needs: [pr]
-    runs-on: ubuntu-latest
-    steps:
-      - name: Setup QEMU
-        uses: docker/setup-qemu-action@v2
-        with:
-          platforms: all
-      - name: Install Go
-        uses: actions/setup-go@v4
-      - name: Install yq
-        run: |
-          sudo add-apt-repository ppa:rmescandon/yq
-          sudo apt-get update
-          sudo apt-get install yq
-      - name: Install Crossplane CLI
-        run: go install github.com/crossplane/crossplane/cmd/crank@latest
-
-      - name: Check out main
-        uses: actions/checkout@v4
-        with:
-          ref: main
-  
-      # Download artifacts from the dynamic job
-      - name: Download artifacts
-        uses: actions/download-artifact@v2
-        with:
-          name: diff-pr-${{ github.sha }}
-
-      # Discover YAML files and their annotations
-      - name: Discover YAML files
-        run: |
-          EXAMPLES_PATH="examples"
-          YAML_FILES=($(find $EXAMPLES_PATH -type f -name '*.yaml'))
-          INPUT_FILES=""
-          for file in "${YAML_FILES[@]}"; do
-            COMPOSITION=$(yq eval '.metadata.annotations."crossplane.io/render-composition-path"' $file)
-            FUNCTION=$(yq eval '.metadata.annotations."crossplane.io/render-function-path"' $file)
-
-            # Skip files where both annotations are null
-            if [[ "$COMPOSITION" == "null" && "$FUNCTION" == "null" ]]; then
-              continue
-            fi
-
-            INPUT_FILES+="$file,$COMPOSITION,$FUNCTION "
-          done
-          echo "INPUT_FILES=${INPUT_FILES}" >> $GITHUB_ENV
-
-      # Run a dynamic job for each input file
-      - name: Run Dynamic Jobs
-        run: |
-          IFS=' ' read -ra INPUT_FILES <<< "${{ env.INPUT_FILES }}"
-          for files in "${INPUT_FILES[@]}"; do
-            IFS=',' read -ra FILE_ARRAY <<< "$files"
-            FILE="${FILE_ARRAY[0]}"
-            COMPOSITION="${FILE_ARRAY[1]}"
-            FUNCTION="${FILE_ARRAY[2]}"
-
-            # Skip files where both annotations are null
-            if [[ "$COMPOSITION" == "null" && "$FUNCTION" == "null" ]]; then
-              continue
-            fi
-
-            crank beta render $FILE $COMPOSITION $FUNCTION >> diff-main-${FILE//\//-}.yaml
-          done
-
-      - name: Install Python
-        uses: actions/setup-python@v4
-
-      # Sort YAML files
-      - name: Sort YAML files
-        run: |
-          for file in diff-main-*.yaml; do
-            python3 -c "import yaml; data = list(yaml.load_all(open('$file'), Loader=yaml.FullLoader)); data.sort(key=lambda x: (x.get('kind', ''), str(x.get('metadata', {}).get('annotations', '')))); yaml.dump_all(data, open('$file', 'w'), default_flow_style=False)"
-          done
-      # Store outputs as artifacts
-      - name: Store outputs
-        uses: actions/upload-artifact@v2
-        with:
-          name: diff-main-${{ github.sha }}
-          path: diff-main-*.yaml
-
-      # Diff the outputs between PR and main
-      - name: Diff
-        id: diff_rev
-        run: |
-          IFS=',' read -ra INPUT_FILES <<< "$INPUT_FILES"
-          for FILE in "${INPUT_FILES[@]}"; do
-            IFS=' ' read -ra FILE_PATHS <<< "$FILE"
-            for SUB_FILE in "${FILE_PATHS[@]}"; do
-              MAIN_FILE="diff-main-${SUB_FILE//\//-}.yaml"
-              PR_FILE="diff-pr-${SUB_FILE//\//-}.yaml"
-              echo "Checking differences for file: $SUB_FILE"
-              echo "Main file path: $MAIN_FILE"
-              echo "PR file path: $PR_FILE"
-              if [ -f "$MAIN_FILE" ] && [ -f "$PR_FILE" ]; then
-                DELTA_NAME=$(echo "DELTA_${SUB_FILE//[\./]/_}" | tr '[:upper:]' '[:lower:]' | sed 's/\//_/g')
-                DELTA_FILE="$DELTA_NAME.diff"
-                echo "Setting DELTA_NAME: $DELTA_NAME"
-                DELTA=$(diff -u "$MAIN_FILE" "$PR_FILE" || true)
-                echo "$DELTA" > "$DELTA_FILE"
-                echo "Differences found for $SUB_FILE. Diff saved in $DELTA_FILE"
-              else
-                echo "Either $MAIN_FILE or $PR_FILE does not exist!"
-              fi
-            done
-          done
-
-      - name: Generate Comment
-        id: generate_comment
-        run: |
-          ALL_DELTAS=""
-
-          # Iterate over all diff files
-          for DELTA_FILE in $(find . -name '*.diff'); do
-            echo "Processing diff file: $DELTA_FILE"
-
-            # Debugging statement
-            cat "$DELTA_FILE"
-
-            # Ensure the file exists and is not empty
-            if [ -s "$DELTA_FILE" ]; then
-              # Use printf to format newlines properly
-              ALL_DELTAS="${ALL_DELTAS}$(printf '\n```diff\n%s\n```' "$(cat "$DELTA_FILE")")"
-              echo "ALL_DELTAS so far: $ALL_DELTAS"
-            else
-              echo "Diff file $DELTA_FILE is either empty or not found!"
-            fi
-          done
-
-          # Debugging statement
-          echo "Final ALL_DELTAS: $ALL_DELTAS"
-
-          # Write the content to a file
-          echo -e "$ALL_DELTAS" > diff_content.txt
-
-      - name: comment PR
-        uses: machine-learning-apps/pr-comment@master
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        with:
-          path: diff_content.txt
+          dir: examples
