[ci][chore] Fix cache keys (#1291)

* [ci][chore] Fix cache keys * Fix indent in generator script * hashFiles with path * add forgotten plugins * cleanup posthog Co-authored-by: Lukas Lösche <[email protected]> Co-authored-by: Matthias Veit <[email protected]>
someengineering · Nov 21, 2022 · 9557ea7 · 9557ea7
1 parent 5bad435
commit 9557ea7
Show file tree

Hide file tree

Showing 40 changed files with 223 additions and 152 deletions.
diff --git a/.github/workflows/check_pr_plugin_aws.yml b/.github/workflows/check_pr_plugin_aws.yml
@@ -7,7 +7,7 @@ on:
     tags:
       - "*.*.*"
     branches:
-        - main
+      - main
   pull_request:
     paths:
       - 'resotolib/**'
@@ -29,12 +29,12 @@ jobs:
           architecture: 'x64'
 
       - name: Restore dependency cache
-        uses: actions/cache@v2
+        uses: actions/cache@v3
         with:
           path: ~/.cache/pip
-          key: $\{\{runner.os}}-pip-$\{\{hashFiles('setup.py')}}
+          key: ${{runner.os}}-pip-${{hashFiles('./plugins/aws/requirements.txt')}}
           restore-keys: |
-            $\{\{ runner.os }}-pip-
+            ${{runner.os}}-pip-
 
       - name: Install Dependencies
         run: |

diff --git a/.github/workflows/check_pr_plugin_aws_k8s.yml b/.github/workflows/check_pr_plugin_aws_k8s.yml
@@ -7,7 +7,7 @@ on:
     tags:
       - "*.*.*"
     branches:
-        - main
+      - main
   pull_request:
     paths:
       - 'resotolib/**'
@@ -29,12 +29,12 @@ jobs:
           architecture: 'x64'
 
       - name: Restore dependency cache
-        uses: actions/cache@v2
+        uses: actions/cache@v3
         with:
           path: ~/.cache/pip
-          key: $\{\{runner.os}}-pip-$\{\{hashFiles('setup.py')}}
+          key: ${{runner.os}}-pip-${{hashFiles('./plugins/aws_k8s/requirements.txt')}}
           restore-keys: |
-            $\{\{ runner.os }}-pip-
+            ${{runner.os}}-pip-
 
       - name: Install Dependencies
         run: |

diff --git a/.github/workflows/check_pr_plugin_cleanup_aws_alarms.yml b/.github/workflows/check_pr_plugin_cleanup_aws_alarms.yml
@@ -7,7 +7,7 @@ on:
     tags:
       - "*.*.*"
     branches:
-        - main
+      - main
   pull_request:
     paths:
       - 'resotolib/**'
@@ -29,12 +29,12 @@ jobs:
           architecture: 'x64'
 
       - name: Restore dependency cache
-        uses: actions/cache@v2
+        uses: actions/cache@v3
         with:
           path: ~/.cache/pip
-          key: $\{\{runner.os}}-pip-$\{\{hashFiles('setup.py')}}
+          key: ${{runner.os}}-pip-${{hashFiles('./plugins/cleanup_aws_alarms/requirements.txt')}}
           restore-keys: |
-            $\{\{ runner.os }}-pip-
+            ${{runner.os}}-pip-
 
       - name: Install Dependencies
         run: |

diff --git a/.github/workflows/check_pr_plugin_cleanup_aws_loadbalancers.yml b/.github/workflows/check_pr_plugin_cleanup_aws_loadbalancers.yml
@@ -7,7 +7,7 @@ on:
     tags:
       - "*.*.*"
     branches:
-        - main
+      - main
   pull_request:
     paths:
       - 'resotolib/**'
@@ -29,12 +29,12 @@ jobs:
           architecture: 'x64'
 
       - name: Restore dependency cache
-        uses: actions/cache@v2
+        uses: actions/cache@v3
         with:
           path: ~/.cache/pip
-          key: $\{\{runner.os}}-pip-$\{\{hashFiles('setup.py')}}
+          key: ${{runner.os}}-pip-${{hashFiles('./plugins/cleanup_aws_loadbalancers/requirements.txt')}}
           restore-keys: |
-            $\{\{ runner.os }}-pip-
+            ${{runner.os}}-pip-
 
       - name: Install Dependencies
         run: |

diff --git a/.github/workflows/check_pr_plugin_cleanup_aws_vpcs.yml b/.github/workflows/check_pr_plugin_cleanup_aws_vpcs.yml
@@ -7,7 +7,7 @@ on:
     tags:
       - "*.*.*"
     branches:
-        - main
+      - main
   pull_request:
     paths:
       - 'resotolib/**'
@@ -29,12 +29,12 @@ jobs:
           architecture: 'x64'
 
       - name: Restore dependency cache
-        uses: actions/cache@v2
+        uses: actions/cache@v3
         with:
           path: ~/.cache/pip
-          key: $\{\{runner.os}}-pip-$\{\{hashFiles('setup.py')}}
+          key: ${{runner.os}}-pip-${{hashFiles('./plugins/cleanup_aws_vpcs/requirements.txt')}}
           restore-keys: |
-            $\{\{ runner.os }}-pip-
+            ${{runner.os}}-pip-
 
       - name: Install Dependencies
         run: |

diff --git a/.github/workflows/check_pr_plugin_cleanup_expired.yml b/.github/workflows/check_pr_plugin_cleanup_expired.yml
@@ -7,7 +7,7 @@ on:
     tags:
       - "*.*.*"
     branches:
-        - main
+      - main
   pull_request:
     paths:
       - 'resotolib/**'
@@ -29,12 +29,12 @@ jobs:
           architecture: 'x64'
 
       - name: Restore dependency cache
-        uses: actions/cache@v2
+        uses: actions/cache@v3
         with:
           path: ~/.cache/pip
-          key: $\{\{runner.os}}-pip-$\{\{hashFiles('setup.py')}}
+          key: ${{runner.os}}-pip-${{hashFiles('./plugins/cleanup_expired/requirements.txt')}}
           restore-keys: |
-            $\{\{ runner.os }}-pip-
+            ${{runner.os}}-pip-
 
       - name: Install Dependencies
         run: |

diff --git a/.github/workflows/check_pr_plugin_cleanup_untagged.yml b/.github/workflows/check_pr_plugin_cleanup_untagged.yml
@@ -7,7 +7,7 @@ on:
     tags:
       - "*.*.*"
     branches:
-        - main
+      - main
   pull_request:
     paths:
       - 'resotolib/**'
@@ -29,12 +29,12 @@ jobs:
           architecture: 'x64'
 
       - name: Restore dependency cache
-        uses: actions/cache@v2
+        uses: actions/cache@v3
         with:
           path: ~/.cache/pip
-          key: $\{\{runner.os}}-pip-$\{\{hashFiles('setup.py')}}
+          key: ${{runner.os}}-pip-${{hashFiles('./plugins/cleanup_untagged/requirements.txt')}}
           restore-keys: |
-            $\{\{ runner.os }}-pip-
+            ${{runner.os}}-pip-
 
       - name: Install Dependencies
         run: |

diff --git a/.github/workflows/check_pr_plugin_cleanup_volumes.yml b/.github/workflows/check_pr_plugin_cleanup_volumes.yml
@@ -7,7 +7,7 @@ on:
     tags:
       - "*.*.*"
     branches:
-        - main
+      - main
   pull_request:
     paths:
       - 'resotolib/**'
@@ -29,12 +29,12 @@ jobs:
           architecture: 'x64'
 
       - name: Restore dependency cache
-        uses: actions/cache@v2
+        uses: actions/cache@v3
         with:
           path: ~/.cache/pip
-          key: $\{\{runner.os}}-pip-$\{\{hashFiles('setup.py')}}
+          key: ${{runner.os}}-pip-${{hashFiles('./plugins/cleanup_volumes/requirements.txt')}}
           restore-keys: |
-            $\{\{ runner.os }}-pip-
+            ${{runner.os}}-pip-
 
       - name: Install Dependencies
         run: |

diff --git a/.github/workflows/check_pr_plugin_digitalocean.yml b/.github/workflows/check_pr_plugin_digitalocean.yml
@@ -7,7 +7,7 @@ on:
     tags:
       - "*.*.*"
     branches:
-        - main
+      - main
   pull_request:
     paths:
       - 'resotolib/**'
@@ -29,12 +29,12 @@ jobs:
           architecture: 'x64'
 
       - name: Restore dependency cache
-        uses: actions/cache@v2
+        uses: actions/cache@v3
         with:
           path: ~/.cache/pip
-          key: $\{\{runner.os}}-pip-$\{\{hashFiles('setup.py')}}
+          key: ${{runner.os}}-pip-${{hashFiles('./plugins/digitalocean/requirements.txt')}}
           restore-keys: |
-            $\{\{ runner.os }}-pip-
+            ${{runner.os}}-pip-
 
       - name: Install Dependencies
         run: |

diff --git a/.github/workflows/check_pr_plugin_digitalocean_k8s.yml b/.github/workflows/check_pr_plugin_digitalocean_k8s.yml
@@ -7,7 +7,7 @@ on:
     tags:
       - "*.*.*"
     branches:
-        - main
+      - main
   pull_request:
     paths:
       - 'resotolib/**'
@@ -29,12 +29,12 @@ jobs:
           architecture: 'x64'
 
       - name: Restore dependency cache
-        uses: actions/cache@v2
+        uses: actions/cache@v3
         with:
           path: ~/.cache/pip
-          key: $\{\{runner.os}}-pip-$\{\{hashFiles('setup.py')}}
+          key: ${{runner.os}}-pip-${{hashFiles('./plugins/digitalocean_k8s/requirements.txt')}}
           restore-keys: |
-            $\{\{ runner.os }}-pip-
+            ${{runner.os}}-pip-
 
       - name: Install Dependencies
         run: |

diff --git a/.github/workflows/check_pr_plugin_dockerhub.yml b/.github/workflows/check_pr_plugin_dockerhub.yml
@@ -7,7 +7,7 @@ on:
     tags:
       - "*.*.*"
     branches:
-        - main
+      - main
   pull_request:
     paths:
       - 'resotolib/**'
@@ -29,12 +29,12 @@ jobs:
           architecture: 'x64'
 
       - name: Restore dependency cache
-        uses: actions/cache@v2
+        uses: actions/cache@v3
         with:
           path: ~/.cache/pip
-          key: $\{\{runner.os}}-pip-$\{\{hashFiles('setup.py')}}
+          key: ${{runner.os}}-pip-${{hashFiles('./plugins/dockerhub/requirements.txt')}}
           restore-keys: |
-            $\{\{ runner.os }}-pip-
+            ${{runner.os}}-pip-
 
       - name: Install Dependencies
         run: |

diff --git a/.github/workflows/check_pr_plugin_example_collector.yml b/.github/workflows/check_pr_plugin_example_collector.yml
@@ -7,7 +7,7 @@ on:
     tags:
       - "*.*.*"
     branches:
-        - main
+      - main
   pull_request:
     paths:
       - 'resotolib/**'
@@ -29,12 +29,12 @@ jobs:
           architecture: 'x64'
 
       - name: Restore dependency cache
-        uses: actions/cache@v2
+        uses: actions/cache@v3
         with:
           path: ~/.cache/pip
-          key: $\{\{runner.os}}-pip-$\{\{hashFiles('setup.py')}}
+          key: ${{runner.os}}-pip-${{hashFiles('./plugins/example_collector/requirements.txt')}}
           restore-keys: |
-            $\{\{ runner.os }}-pip-
+            ${{runner.os}}-pip-
 
       - name: Install Dependencies
         run: |

diff --git a/.github/workflows/check_pr_plugin_gcp.yml b/.github/workflows/check_pr_plugin_gcp.yml
@@ -7,7 +7,7 @@ on:
     tags:
       - "*.*.*"
     branches:
-        - main
+      - main
   pull_request:
     paths:
       - 'resotolib/**'
@@ -29,12 +29,12 @@ jobs:
           architecture: 'x64'
 
       - name: Restore dependency cache
-        uses: actions/cache@v2
+        uses: actions/cache@v3
         with:
           path: ~/.cache/pip
-          key: $\{\{runner.os}}-pip-$\{\{hashFiles('setup.py')}}
+          key: ${{runner.os}}-pip-${{hashFiles('./plugins/gcp/requirements.txt')}}
           restore-keys: |
-            $\{\{ runner.os }}-pip-
+            ${{runner.os}}-pip-
 
       - name: Install Dependencies
         run: |

diff --git a/.github/workflows/check_pr_plugin_github.yml b/.github/workflows/check_pr_plugin_github.yml
@@ -7,7 +7,7 @@ on:
     tags:
       - "*.*.*"
     branches:
-        - main
+      - main
   pull_request:
     paths:
       - 'resotolib/**'
@@ -29,12 +29,12 @@ jobs:
           architecture: 'x64'
 
       - name: Restore dependency cache
-        uses: actions/cache@v2
+        uses: actions/cache@v3
         with:
           path: ~/.cache/pip
-          key: $\{\{runner.os}}-pip-$\{\{hashFiles('setup.py')}}
+          key: ${{runner.os}}-pip-${{hashFiles('./plugins/github/requirements.txt')}}
           restore-keys: |
-            $\{\{ runner.os }}-pip-
+            ${{runner.os}}-pip-
 
       - name: Install Dependencies
         run: |

diff --git a/.github/workflows/check_pr_plugin_k8s.yml b/.github/workflows/check_pr_plugin_k8s.yml
@@ -7,7 +7,7 @@ on:
     tags:
       - "*.*.*"
     branches:
-        - main
+      - main
   pull_request:
     paths:
       - 'resotolib/**'
@@ -29,12 +29,12 @@ jobs:
           architecture: 'x64'
 
       - name: Restore dependency cache
-        uses: actions/cache@v2
+        uses: actions/cache@v3
         with:
           path: ~/.cache/pip
-          key: $\{\{runner.os}}-pip-$\{\{hashFiles('setup.py')}}
+          key: ${{runner.os}}-pip-${{hashFiles('./plugins/k8s/requirements.txt')}}
           restore-keys: |
-            $\{\{ runner.os }}-pip-
+            ${{runner.os}}-pip-
 
       - name: Install Dependencies
         run: |

diff --git a/.github/workflows/check_pr_plugin_onelogin.yml b/.github/workflows/check_pr_plugin_onelogin.yml
@@ -7,7 +7,7 @@ on:
     tags:
       - "*.*.*"
     branches:
-        - main
+      - main
   pull_request:
     paths:
       - 'resotolib/**'
@@ -29,12 +29,12 @@ jobs:
           architecture: 'x64'
 
       - name: Restore dependency cache
-        uses: actions/cache@v2
+        uses: actions/cache@v3
         with:
           path: ~/.cache/pip
-          key: $\{\{runner.os}}-pip-$\{\{hashFiles('setup.py')}}
+          key: ${{runner.os}}-pip-${{hashFiles('./plugins/onelogin/requirements.txt')}}
           restore-keys: |
-            $\{\{ runner.os }}-pip-
+            ${{runner.os}}-pip-
 
       - name: Install Dependencies
         run: |