update secret usage in workflows + tests

.github/workflows/ci.yaml

@@ -12,17 +12,6 @@ on:
     - cron: "53 0 * * *" # Daily at 00:53 UTC
   # Triggered on push to branch "main" by .github/workflows/release.yaml
   workflow_call:
-    secrets:
-      CHARMHUB_TOKEN:
-        required: true
-      AWS_ACCESS_KEY:
-        required: true
-      AWS_SECRET_KEY:
-        required: true
-      GCP_ACCESS_KEY:
-        required: true
-      GCP_SECRET_KEY:
-        required: true
 
 jobs:
   lint:
@@ -82,9 +71,8 @@ jobs:
   integration-test:
     name: Integration test charm
     needs:
-      # comment out temporarily to test workflow on GitHub faster
-      # - lint
-      # - unit-test
+      - lint
+      - unit-test
       - build
     uses: canonical/data-platform-workflows/.github/workflows/[email protected]
     with:

.github/workflows/release.yaml

@@ -8,12 +8,7 @@ on:
 jobs:
   ci-tests:
     uses: ./.github/workflows/ci.yaml
-    secrets:
-      CHARMHUB_TOKEN: "${{ secrets.CHARMHUB_TOKEN }}"
-      AWS_ACCESS_KEY: "${{ secrets.AWS_ACCESS_KEY }}"
-      AWS_SECRET_KEY: "${{ secrets.AWS_SECRET_KEY }}"
-      GCP_ACCESS_KEY: "${{ secrets.GCP_ACCESS_KEY }}"
-      GCP_SECRET_KEY: "${{ secrets.GCP_SECRET_KEY }}"
+    secrets: inherit
 
   build:
     name: Build charm

tests/integration/backup_tests/helpers.py

@@ -97,8 +97,8 @@ async def count_failed_backups(db_unit: ops.model.Unit) -> int:
 async def set_credentials(ops_test: OpsTest, github_secrets, cloud: str) -> None:
     """Sets the s3 crednetials for the provided cloud, valid options are AWS or GCP."""
     # set access key and secret keys
-    access_key = github_secrets[f"{cloud}_ACCESS_KEY_ID"]
-    secret_key = github_secrets[f"{cloud}_SECRET_ACCESS_KEY"]
+    access_key = github_secrets[f"{cloud}_ACCESS_KEY"]
+    secret_key = github_secrets[f"{cloud}_SECRET_KEY"]
     assert access_key and secret_key, f"{cloud} access key and secret key not provided."
 
     s3_integrator_unit = ops_test.model.applications[S3_APP_NAME].units[0]