Preparing for new release

.github/workflows/build-pr.yml

@@ -22,24 +22,24 @@ jobs:
     runs-on: ubuntu-latest
     environment: dev
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Setup go
-        uses: actions/setup-go@v3
+        uses: actions/setup-go@v5
         with:
-          go-version: '1.20.1'
+          go-version: '1.22'
       - name: Go Version
         run: go version
       - name: Setup Node
-        uses: actions/setup-node@v3
+        uses: actions/setup-node@v4
         with:
-          node-version: '18'
+          node-version: '20'
       - name: Setup python
-        uses: actions/setup-python@v4
+        uses: actions/setup-python@v5
         with:
-          python-version: '3.7'
+          python-version: '3.11'
           cache: 'pip'
       - name: Cache Go modules
-        uses: actions/cache@v2
+        uses: actions/cache@v3
         with:
           path: ${{ github.workspace }}/go/pkg/mod
           key: ${{ runner.os }}-go-${{ hashFiles('**/go.sum') }}
@@ -58,17 +58,25 @@ jobs:
       - name: Python Setup
         working-directory: cla-backend
         run: |
+          python -m venv .venv
+          source .venv/bin/activate
           pip install --upgrade pip
           pip install -r requirements.txt
 
       - name: Python Lint
         working-directory: cla-backend
         run: |
+          python -m venv .venv
+          source .venv/bin/activate
+          pip install --upgrade pylint
           pylint cla/*.py || true
 
       - name: Python Test
         working-directory: cla-backend
         run: |
+          python -m venv .venv
+          source .venv/bin/activate
+          pip install --upgrade pytest py pytest-cov pytest-clarity
           pytest "cla/tests" -p no:warnings
         env:
           PLATFORM_GATEWAY_URL: https://api-gw.dev.platform.linuxfoundation.org
@@ -79,17 +87,15 @@ jobs:
 
       - name: Go Setup
         working-directory: cla-backend-go
-        run: |
-          make clean setup
+        run: make clean setup
 
       - name: Go Dependencies
         working-directory: cla-backend-go
         run: make deps
 
       - name: Go Swagger Generate
         working-directory: cla-backend-go
-        run: |
-          make swagger
+        run: make swagger
 
       - name: Go Build
         working-directory: cla-backend-go
@@ -98,9 +104,8 @@ jobs:
 
       - name: Go Test
         working-directory: cla-backend-go
-        run: |
-          make test
+        run: make test
 
       - name: Go Lint
         working-directory: cla-backend-go
-        run: make lint
+        run: make lint

.github/workflows/codeql-analysis.yml

@@ -19,7 +19,7 @@ jobs:
 
     steps:
     - name: Checkout repository
-      uses: actions/checkout@v2
+      uses: actions/checkout@v3
       with:
         # We must fetch at least the immediate parents so that if this is
         # a pull request then we can checkout the head.

.github/workflows/deploy-dev.yml

@@ -22,30 +22,36 @@ jobs:
     runs-on: ubuntu-latest
     environment: dev
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
+
       - name: Setup go
-        uses: actions/setup-go@v3
+        uses: actions/setup-go@v5
         with:
-          go-version: '1.20.1'
+          go-version: '1.22'
+
       - name: Go Version
         run: go version
+
       - name: Setup Node
-        uses: actions/setup-node@v3
+        uses: actions/setup-node@v4
         with:
-          node-version: '18'
+          node-version: '20'
+
       - name: Setup python
-        uses: actions/setup-python@v4
+        uses: actions/setup-python@v5
         with:
-          python-version: '3.7'
+          python-version: '3.11'
           cache: 'pip'
+
       - name: Configure AWS Credentials
         uses: aws-actions/configure-aws-credentials@v4
         with:
           audience: sts.amazonaws.com
           role-to-assume: arn:aws:iam::395594542180:role/github-actions-deploy
           aws-region: us-east-1
+
       - name: Cache Go modules
-        uses: actions/cache@v2
+        uses: actions/cache@v3
         with:
           path: ${{ github.workspace }}/go/pkg/mod
           key: ${{ runner.os }}-go-${{ hashFiles('**/go.sum') }}
@@ -64,19 +70,25 @@ jobs:
       - name: Python Setup
         working-directory: cla-backend
         run: |
+          python -m venv .venv
+          source .venv/bin/activate
           pip install --upgrade pip
           pip install -r requirements.txt
 
-
-
       - name: Python Lint
         working-directory: cla-backend
         run: |
+          python -m venv .venv
+          source .venv/bin/activate
+          pip install --upgrade pylint
           pylint cla/*.py || true
 
       - name: Python Test
         working-directory: cla-backend
         run: |
+          python -m venv .venv
+          source .venv/bin/activate
+          pip install --upgrade pytest py pytest-cov pytest-clarity
           pytest "cla/tests" -p no:warnings
         env:
           PLATFORM_GATEWAY_URL: https://api-gw.dev.platform.linuxfoundation.org
@@ -106,8 +118,7 @@ jobs:
 
       - name: Go Test
         working-directory: cla-backend-go
-        run: |
-          make test
+        run: make test
 
       - name: Go Lint
         working-directory: cla-backend-go
@@ -126,7 +137,6 @@ jobs:
           cp ../cla-backend-go/bin/zipbuilder-lambda bin/
           cp ../cla-backend-go/bin/gitlab-repository-check-lambda bin/
 
-
       - name: EasyCLA v1 Deployment us-east-1
         working-directory: cla-backend
         run: |
@@ -142,6 +152,7 @@ jobs:
           if [[ ! -f serverless.yml ]]; then echo "Missing serverless.yml file. Exiting..."; exit 1; fi
           if [[ ! -f serverless-authorizer.yml ]]; then echo "Missing serverless-authorizer.yml file. Exiting..."; exit 1; fi
           yarn sls deploy --force --stage ${STAGE} --region us-east-1 --verbose
+
       - name: EasyCLA v1 Service Check
         run: |
           sudo apt install curl jq -y
@@ -176,14 +187,15 @@ jobs:
             echo "Failed to get a successful response from endpoint: ${v3_url}"
             exit ${exit_code}
           fi
+
       - name: EasyCLA v2 Deployment us-east-2
         working-directory: cla-backend-go
         run: |
           if [[ ! -f bin/backend-aws-lambda ]]; then echo "Missing bin/backend-aws-lambda binary file. Exiting..."; exit 1; fi
           if [[ ! -f bin/user-subscribe-lambda ]]; then echo "Missing bin/user-subscribe-lambda binary file. Exiting..."; exit 1; fi
           rm -rf ./node_modules/
           yarn install
-          yarn sls deploy --force --stage ${STAGE} --region us-east-2
+          yarn sls deploy --force --stage ${STAGE} --region us-east-2 --verbose
 
       - name: EasyCLA v2 Service Check
         run: |

.github/workflows/deploy-prod.yml

@@ -24,22 +24,21 @@ jobs:
     runs-on: ubuntu-latest
     environment: prod
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Setup go
-        uses: actions/setup-go@v3
+        uses: actions/setup-go@v5
         with:
-          go-version: '1.20.1'
-          check-latest: true
+          go-version: '1.22'
       - name: Go Version
         run: go version
       - name: Setup Node
-        uses: actions/setup-node@v3
+        uses: actions/setup-node@v4
         with:
-          node-version: '18'
+          node-version: '20'
       - name: Setup python
-        uses: actions/setup-python@v4
+        uses: actions/setup-python@v5
         with:
-          python-version: '3.7'
+          python-version: '3.11'
           cache: 'pip'
       - name: Configure AWS Credentials
         uses: aws-actions/configure-aws-credentials@v4
@@ -48,7 +47,7 @@ jobs:
           role-to-assume: arn:aws:iam::716487311010:role/github-actions-deploy
           aws-region: us-east-1
       - name: Cache Go modules
-        uses: actions/cache@v2
+        uses: actions/cache@v3
         with:
           path: ${{ github.workspace }}/go/pkg/mod
           key: ${{ runner.os }}-go-${{ hashFiles('**/go.sum') }}
@@ -67,6 +66,8 @@ jobs:
       - name: Python Setup
         working-directory: cla-backend
         run: |
+          python -m venv .venv
+          source .venv/bin/activate
           pip install --upgrade pip
           pip install -r requirements.txt
 
@@ -117,6 +118,7 @@ jobs:
           if [[ ! -f serverless.yml ]]; then echo "Missing serverless.yml file. Exiting..."; exit 1; fi
           if [[ ! -f serverless-authorizer.yml ]]; then echo "Missing serverless-authorizer.yml file. Exiting..."; exit 1; fi
           yarn sls deploy --force --stage ${STAGE} --region us-east-1 --verbose
+
       - name: EasyCLA v1 Service Check
         run: |
           sudo apt install curl jq -y

.github/workflows/deploy-staging.yml

@@ -39,7 +39,7 @@ jobs:
       - name: Setup python
         uses: actions/setup-python@v4
         with:
-          python-version: '3.7'
+          python-version: '3.8'
           cache: 'pip'
       - name: Configure AWS Credentials
         uses: aws-actions/configure-aws-credentials@v4
@@ -48,7 +48,7 @@ jobs:
           role-to-assume: arn:aws:iam::844390194980:role/github-actions-deploy
           aws-region: us-east-1
       - name: Cache Go modules
-        uses: actions/cache@v2
+        uses: actions/cache@v3
         with:
           path: ${{ github.workspace }}/go/pkg/mod
           key: ${{ runner.os }}-go-${{ hashFiles('**/go.sum') }}

.github/workflows/yarn-scan-backend-go-pr.yml

@@ -19,7 +19,7 @@ jobs:
       - name: Setup Node
         uses: actions/setup-node@v3
         with:
-          node-version: '16'
+          node-version: '18'
       - name: Setup
         run: yarn install
       - name: Yarn Audit

.github/workflows/yarn-scan-backend-pr.yml

@@ -19,7 +19,7 @@ jobs:
       - name: Setup Node
         uses: actions/setup-node@v3
         with:
-          node-version: '16'
+          node-version: '18'
       - name: Setup
         run: yarn install
       - name: Yarn Audit

cla-backend-go/cmd/dynamo_events_lambda/main.go

@@ -115,12 +115,7 @@ func init() {
 	githubOrganizationsService := github_organizations.NewService(githubOrganizationsRepo, repositoriesRepo, projectClaGroupRepo)
 	repositoriesService := repositories.NewService(repositoriesRepo, githubOrganizationsRepo, projectClaGroupRepo)
 
-	gerritService := gerrits.NewService(gerritRepo, &gerrits.LFGroup{
-		LfBaseURL:    configFile.LFGroup.ClientURL,
-		ClientID:     configFile.LFGroup.ClientID,
-		ClientSecret: configFile.LFGroup.ClientSecret,
-		RefreshToken: configFile.LFGroup.RefreshToken,
-	})
+	gerritService := gerrits.NewService(gerritRepo)
 	// Services
 	projectService := service.NewService(projectRepo, repositoriesRepo, gerritRepo, projectClaGroupRepo, usersRepo)
 

cla-backend-go/cmd/gitlab_repository_check/handler/handler.go

@@ -137,12 +137,7 @@ func Handler(ctx context.Context) error {
 		v1ProjectClaGroupRepo,
 	})
 
-	gerritService := gerrits.NewService(gerritRepo, &gerrits.LFGroup{
-		LfBaseURL:    configFile.LFGroup.ClientURL,
-		ClientID:     configFile.LFGroup.ClientID,
-		ClientSecret: configFile.LFGroup.ClientSecret,
-		RefreshToken: configFile.LFGroup.RefreshToken,
-	})
+	gerritService := gerrits.NewService(gerritRepo)
 
 	approvalsTableName := "cla-" + stage + "-approvals"
 

cla-backend-go/cmd/migrate_approval_list/main.go

@@ -81,7 +81,7 @@ func init() {
 		v1ProjectClaGroupRepo,
 	})
 	ghOrgRepo = github_organizations.NewRepository(awsSession, stage)
-	gerritService = gerrits.NewService(gerritsRepo, nil)
+	gerritService = gerrits.NewService(gerritsRepo)
 	signatureRepo = signatures.NewRepository(awsSession, stage, companyRepo, usersRepo, eventsService, &ghRepo, ghOrgRepo, gerritService, approvalRepo)
 
 	log.Info("initialized repositories\n")

cla-backend-go/cmd/server.go

@@ -273,13 +273,7 @@ func server(localMode bool) http.Handler {
 		v1ProjectClaGroupRepo,
 	})
 
-	gerritService := gerrits.NewService(gerritRepo, &gerrits.LFGroup{
-		LfBaseURL:     configFile.LFGroup.ClientURL,
-		ClientID:      configFile.LFGroup.ClientID,
-		ClientSecret:  configFile.LFGroup.ClientSecret,
-		RefreshToken:  configFile.LFGroup.RefreshToken,
-		EventsService: eventsService,
-	})
+	gerritService := gerrits.NewService(gerritRepo)
 
 	// Signature repository handler
 	signaturesRepo := signatures.NewRepository(awsSession, stage, v1CompanyRepo, usersRepo, eventsService, gitV1Repository, githubOrganizationsRepo, gerritService, approvalsRepo)