We got to keep pushing 😅

Hakim-Kay · Jun 13, 2024 · 50a749b · 50a749b
1 parent b3f03e5
commit 50a749b
Showing 1 changed file with 30 additions and 40 deletions.
diff --git a/.github/workflows/pipeline.yml b/.github/workflows/pipeline.yml
@@ -28,64 +28,54 @@ jobs:
       - name: Install Chromedriver
         run: sudo apt-get install -y chromium-chromedriver
 
-      - name: Install 1Password CLI
-        uses: 1Password/install-cli-action@v1
-
-      - name: Sign in to 1Password
-        env:
-          OP_CONNECT_HOST: ${{ secrets.OP_CONNECT_HOST }}
-          OP_CONNECT_TOKEN: ${{ secrets.OP_CONNECT_TOKEN }}
-        run: |
-          eval $(op signin --account $OP_CONNECT_HOST --token $OP_CONNECT_TOKEN)
-          echo "1Password CLI installed and signed in successfully."
-
-      - name: Export secrets from 1Password
+      - name: Load secrets from 1Password
+        id: op-secrets
+        uses: 1password/load-secrets-action@v1
+        with:
+          export-env: true
         env:
-          OP_CONNECT_HOST: ${{ secrets.OP_CONNECT_HOST }}
-          OP_CONNECT_TOKEN: ${{ secrets.OP_CONNECT_TOKEN }}
-        run: |
-          eval $(op run --env-file=./.env -- echo "Secrets loaded.")
+          OP_SERVICE_ACCOUNT_TOKEN: ${{ secrets.OP_SERVICE_ACCOUNT_TOKEN }}
 
       - name: Wait for PostgreSQL to be ready
         run: |
           until pg_isready -h $DB_HOST -p $DB_PORT -U $DATABASE_USERNAME; do echo waiting for postgres; sleep 2; done
 
       - name: Build with Maven
         env:
-          DB_HOST: ${{ env.DB_HOST }}
-          DB_PORT: ${{ env.DB_PORT }}
-          DB_NAME: ${{ env.DB_NAME }}
-          DB_USER: ${{ env.DATABASE_USERNAME }}
-          DB_PASSWORD: ${{ env.DATABASE_PASSWORD }}
-          DATABASE_URL: ${{ env.DATABASE_URL }}
-          AWS_ACCESS_KEY_ID: ${{ env.AWS_ACCESS_KEY_ID }}
-          AWS_SECRET_ACCESS_KEY: ${{ env.AWS_SECRET_ACCESS_KEY }}
-          AWS_REGION: ${{ env.AWS_REGION }}
-          AWS_S3_BUCKET_NAME: ${{ env.AWS_S3_BUCKET_NAME }}
+          DB_HOST: ${{ secrets.DB_HOST }}
+          DB_PORT: ${{ secrets.DB_PORT }}
+          DB_NAME: ${{ secrets.DB_NAME }}
+          DB_USER: ${{ secrets.DATABASE_USERNAME }}
+          DB_PASSWORD: ${{ secrets.DATABASE_PASSWORD }}
+          DATABASE_URL: ${{ secrets.DATABASE_URL }}
+          AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
+          AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
+          AWS_REGION: ${{ secrets.AWS_REGION }}
+          AWS_S3_BUCKET_NAME: ${{ secrets.AWS_S3_BUCKET_NAME }}
         run: mvn clean package -DskipTests
 
       - name: Run tests
         env:
-          DB_HOST: ${{ env.DB_HOST }}
-          DB_PORT: ${{ env.DB_PORT }}
-          DB_NAME: ${{ env.DB_NAME }}
-          DB_USER: ${{ env.DATABASE_USERNAME }}
-          DB_PASSWORD: ${{ env.DATABASE_PASSWORD }}
-          DATABASE_URL: ${{ env.DATABASE_URL }}
-          AWS_ACCESS_KEY_ID: ${{ env.AWS_ACCESS_KEY_ID }}
-          AWS_SECRET_ACCESS_KEY: ${{ env.AWS_SECRET_ACCESS_KEY }}
-          AWS_REGION: ${{ env.AWS_REGION }}
-          AWS_S3_BUCKET_NAME: ${{ env.AWS_S3_BUCKET_NAME }}
+          DB_HOST: ${{ secrets.DB_HOST }}
+          DB_PORT: ${{ secrets.DB_PORT }}
+          DB_NAME: ${{ secrets.DB_NAME }}
+          DB_USER: ${{ secrets.DATABASE_USERNAME }}
+          DB_PASSWORD: ${{ secrets.DATABASE_PASSWORD }}
+          DATABASE_URL: ${{ secrets.DATABASE_URL }}
+          AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
+          AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
+          AWS_REGION: ${{ secrets.AWS_REGION }}
+          AWS_S3_BUCKET_NAME: ${{ secrets.AWS_S3_BUCKET_NAME }}
         run: mvn test
 
       - name: Build Docker image
         run: docker build -t mhk1/acebook_penguins:latest .
 
       - name: Login to Docker Hub
-        env:
-          DOCKERHUB_PASSWORD: ${{ secrets.DOCKERHUB_PASSWORD }}
-          DOCKERHUB_USERNAME: ${{ secrets.DOCKERHUB_USERNAME }}
-        run: echo "$DOCKERHUB_PASSWORD" | docker login -u "$DOCKERHUB_USERNAME" --password-stdin
+        uses: docker/login-action@v2
+        with:
+          username: ${{ steps.op-secrets.outputs.DOCKERHUB_USERNAME }}
+          password: ${{ steps.op-secrets.outputs.DOCKERHUB_PASSWORD }}
 
       - name: Push Docker image
         run: docker push mhk1/acebook_penguins:latest