UPD: merge branch 'main' into dependabot/npm_and_yarn/npm_and_yarn-66cf255e39

Author: NewerKey

.env.example

@@ -5,12 +5,7 @@ POSTGRES_PASSWORD="admin"
 
 BASE_URL="http://localhost:7007"
 
-GITHUB_CLIENT_ID="your-id"
-GITHUB_CLIENT_SECRET="your-secret"
-
 GITHUB_TOKEN="your-token"
 
-K8S_URL="k8s-url"
-K8S_ACCOUNT_TOKEN="k8s-account-token"
-K8S_CA_DATA="k8s-ca-data"
-K8S_CA_FILE="k8s-ca-file"
+GOOGLE_CLIENT_ID="your-id"
+GOOGLE_CLIENT_SECRET="your-secret"

.github/workflows/cd-workflow.yaml

@@ -0,0 +1,103 @@
+name: Deploy backstage
+
+on:
+  push:
+    branches:
+      - main
+  pull_request:
+    branches:
+      - main
+
+jobs:
+  create-and-push-image:
+    permissions:
+      id-token: write
+      contents: read
+    name: "Create and push the Docker image to GAR"
+    runs-on: ubuntu-latest
+    defaults:
+      run:
+        shell: bash
+
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+
+      - id: 'setup-qemu'
+        name: Set up QEMU
+        uses: docker/setup-qemu-action@v3
+
+      - id: 'docker-buildx-setup'
+        name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+
+      - name: 'Authenticate to Google Cloud'
+        id: 'auth'
+        uses: 'google-github-actions/auth@v2'
+        with:
+          create_credentials_file: true
+          token_format: "access_token"
+          workload_identity_provider: ${{ secrets.GCP_WORKLOAD_IDENTITY_PROVIDER }}
+          service_account: ${{ secrets.GCP_DEPLOY_SA }}
+
+      - name: "Login to GAR"
+        id: 'login-gar'
+        uses: docker/login-action@v3
+        with:
+          registry: ${{ secrets.GCP_REGION }}-docker.pkg.dev/${{ secrets.GCP_PROJECT_ID }}/${{ secrets.GCP_GAR_REPO }}
+          username: oauth2accesstoken
+          password: ${{ steps.auth.outputs.access_token }}
+
+      - id: 'build-and-push'
+        name: 'Build and Push docker Image'
+        uses: docker/build-push-action@v5
+        with:
+          push: true
+          context: .
+          file: ./Dockerfile
+          platforms: linux/amd64
+          tags: ${{ secrets.GCP_REGION }}-docker.pkg.dev/${{ secrets.GCP_PROJECT_ID }}/${{ secrets.GCP_GAR_REPO }}/backstage-image:${{ github.sha }}
+          build-args: |
+            APP_ENV=docker
+
+
+  deploy-image:
+    permissions:
+      id-token: write
+      contents: read
+
+    name: "Deploy image on cloud run"
+    runs-on: ubuntu-latest
+    defaults:
+      run:
+        shell: bash
+    needs: create-and-push-image
+
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+
+      - id: 'auth'
+        name: 'Authenticate to Google Cloud'
+        uses: 'google-github-actions/auth@v2'
+        with:
+          create_credentials_file: true
+          workload_identity_provider: ${{ secrets.GCP_WORKLOAD_IDENTITY_PROVIDER }}
+          service_account: ${{ secrets.GCP_DEPLOY_SA }}
+
+      - name: Deploy to Cloud Run
+        id: 'deploy'
+        uses: 'google-github-actions/deploy-cloudrun@v2'
+        with:
+          service: ${{ secrets.GCP_CLOUD_RUN_SERVICE }}
+          image: ${{ secrets.GCP_REGION }}-docker.pkg.dev/${{ secrets.GCP_PROJECT_ID }}/${{ secrets.GCP_GAR_REPO }}/backstage-image:${{ github.sha }}
+          region: ${{ secrets.GCP_REGION }}
+          flags: '--platform managed --allow-unauthenticated --port=7007'
+          secrets: |-
+            GITHUB_TOKEN=github_token:latest
+            GITLAB_TOKEN=gitlab_token:latest
+            GOOGLE_CLIENT_ID=google_client_id:latest
+            GOOGLE_CLIENT_SECRET=google_client_secret:latest
+            PROD_GITHUB_CLIENT_SECRET=github_client_secret:latest
+            PROD_GITHUB_CLIENT_ID=github_client_id:latest
+            

.github/workflows/ci-workflow.yaml

@@ -3,34 +3,40 @@ name: CI Workflow
 on:
   push:
     branches:
-      - '**'
+      - main
   pull_request:
     branches:
-      - '**'
+      - main
 
 jobs:
   setup_and_test:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        node-version: ['18.x', '20.x']
+        node-version: ['20.x']
 
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
         with:
           fetch-depth: 0
 
+      - name: Enable Corepack
+        run: corepack enable
+
+      - name: Set Yarn Version
+        run: corepack prepare [email protected] --activate
+      
       - name: Set up Node.js
-        uses: actions/setup-node@v2
+        uses: actions/setup-node@v4
         with:
           node-version: ${{ matrix.node-version }}
-          cache: 'yarn'
+          cache: 'yarn'          
 
       - name: Check Node.js version
         run: node -v
 
       - name: Install dependencies
-        run: yarn install --frozen-lockfile
+        run: yarn install
 
       # - name: Lint code
       #   run: yarn lint:all
@@ -44,7 +50,7 @@ jobs:
   validate_commit_messages:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
         with:
           fetch-depth: 0
       - name: Ensure full git history
@@ -73,7 +79,7 @@ jobs:
   validate_branch_names:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
       - name: Validate Branch Names
         run: |
           if [ "${{ github.event_name }}" == "pull_request" ]; then
@@ -88,7 +94,7 @@ jobs:
             branch_name=$(git rev-parse --abbrev-ref HEAD)
             echo "Current branch: $branch_name"
           fi
-          if ! echo "$branch_name" | grep -Eq '^(main|feature/.+|hotfix/.+)$'; then
+          if ! echo "$branch_name" | grep -Eq '^(main|feature/.+|hotfix/.+|dependabot/.+)$'; then
             echo "Error: Branch name $branch_name does not fit the naming convention."
             exit 1
           fi

.github/workflows/create-user-db.yml

@@ -1,8 +1,6 @@
-name: Test and E2E tests
-run-name: Run tests and E2E tests
-
+name: Test and E2E tests on PR
+run-name: Run tests and E2E tests on PR
 on:  
-  push:
   pull_request:
     branches:
       - main
@@ -11,28 +9,44 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
+
+      - name: Enable Corepack
+        run: corepack enable
+
+      - name: Set Yarn Version
+        run: corepack prepare [email protected] --activate
+
+        
       - name: Use Node.js
         uses: actions/setup-node@v3
         with:
           node-version: '20'
+
       - run: yarn install
       - run: yarn backstage-cli repo test
 
   run-e2e-tests:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4 #chekcout te repository
+      - uses: actions/checkout@v4
+
+      - name: Enable Corepack
+        run: corepack enable
+
+      - name: Set Yarn Version
+        run: corepack prepare [email protected] --activate
+        
       - name: Use Node.js
-        uses: actions/setup-node@v3 #setup node version 20
+        uses: actions/setup-node@v3
         with:
           node-version: '20'
 
-      - name: Install dependencies #install dependencies
+      - name: Install dependencies
         run: yarn install
 
       - name: Run E2E tests
         env:
-          PLAYWRIGHT_URL: http://localhost:3000 # set the URL of the app to test with playwright
-          CI: # unset CI because it is set by default in Github actions
+          PLAYWRIGHT_URL: http://localhost:3000
+          CI:
         run: |
           yarn test:e2e

.github/workflows/create-user-mongo-db.yml

@@ -56,3 +56,6 @@ e2e-test-report/
 pg_values.yaml
 
 *secret.yaml
+
+
+key/

.github/workflows/run-tests.yml

@@ -0,0 +1,6 @@
+nodeLinker: node-modules
+
+plugins:
+  - checksum: 8fa2e3a1cdf5076dde96b177618478419daea000b8038412817583e4d309fd39bf4813a337eb1fad3bfe9036d31732f7416383affbe3d420f48eacb60f6184d5
+    path: .yarn/plugins/@yarnpkg/plugin-backstage.cjs
+    spec: "https://versions.backstage.io/v1/tags/main/yarn-plugin"