Skip to content

Commit fa4d5a9

Browse files
lukaszgryglickilukaszgryglicki
authored
Merge pull request #4580 from communitybridge/dev
Preparing for new release
2 parents 325a657 + 3f87d9d commit fa4d5a9

File tree

72 files changed

+7627
-5943
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

72 files changed

+7627
-5943
lines changed

‎.github/workflows/build-pr.yml‎

Lines changed: 20 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -22,24 +22,24 @@ jobs:
2222
runs-on: ubuntu-latest
2323
environment: dev
2424
steps:
25-
- uses: actions/checkout@v3
25+
- uses: actions/checkout@v4
2626
- name: Setup go
27-
uses: actions/setup-go@v3
27+
uses: actions/setup-go@v5
2828
with:
29-
go-version: '1.20.1'
29+
go-version: '1.22'
3030
- name: Go Version
3131
run: go version
3232
- name: Setup Node
33-
uses: actions/setup-node@v3
33+
uses: actions/setup-node@v4
3434
with:
35-
node-version: '18'
35+
node-version: '20'
3636
- name: Setup python
37-
uses: actions/setup-python@v4
37+
uses: actions/setup-python@v5
3838
with:
39-
python-version: '3.7'
39+
python-version: '3.11'
4040
cache: 'pip'
4141
- name: Cache Go modules
42-
uses: actions/cache@v2
42+
uses: actions/cache@v3
4343
with:
4444
path: ${{ github.workspace }}/go/pkg/mod
4545
key: ${{ runner.os }}-go-${{ hashFiles('**/go.sum') }}
@@ -58,17 +58,25 @@ jobs:
5858
- name: Python Setup
5959
working-directory: cla-backend
6060
run: |
61+
python -m venv .venv
62+
source .venv/bin/activate
6163
pip install --upgrade pip
6264
pip install -r requirements.txt
6365
6466
- name: Python Lint
6567
working-directory: cla-backend
6668
run: |
69+
python -m venv .venv
70+
source .venv/bin/activate
71+
pip install --upgrade pylint
6772
pylint cla/*.py || true
6873
6974
- name: Python Test
7075
working-directory: cla-backend
7176
run: |
77+
python -m venv .venv
78+
source .venv/bin/activate
79+
pip install --upgrade pytest py pytest-cov pytest-clarity
7280
pytest "cla/tests" -p no:warnings
7381
env:
7482
PLATFORM_GATEWAY_URL: https://api-gw.dev.platform.linuxfoundation.org
@@ -79,17 +87,15 @@ jobs:
7987

8088
- name: Go Setup
8189
working-directory: cla-backend-go
82-
run: |
83-
make clean setup
90+
run: make clean setup
8491

8592
- name: Go Dependencies
8693
working-directory: cla-backend-go
8794
run: make deps
8895

8996
- name: Go Swagger Generate
9097
working-directory: cla-backend-go
91-
run: |
92-
make swagger
98+
run: make swagger
9399

94100
- name: Go Build
95101
working-directory: cla-backend-go
@@ -98,9 +104,8 @@ jobs:
98104
99105
- name: Go Test
100106
working-directory: cla-backend-go
101-
run: |
102-
make test
107+
run: make test
103108

104109
- name: Go Lint
105110
working-directory: cla-backend-go
106-
run: make lint
111+
run: make lint

‎.github/workflows/codeql-analysis.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919

2020
steps:
2121
- name: Checkout repository
22-
uses: actions/checkout@v2
22+
uses: actions/checkout@v3
2323
with:
2424
# We must fetch at least the immediate parents so that if this is
2525
# a pull request then we can checkout the head.

‎.github/workflows/deploy-dev.yml‎

Lines changed: 26 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -22,30 +22,36 @@ jobs:
2222
runs-on: ubuntu-latest
2323
environment: dev
2424
steps:
25-
- uses: actions/checkout@v3
25+
- uses: actions/checkout@v4
26+
2627
- name: Setup go
27-
uses: actions/setup-go@v3
28+
uses: actions/setup-go@v5
2829
with:
29-
go-version: '1.20.1'
30+
go-version: '1.22'
31+
3032
- name: Go Version
3133
run: go version
34+
3235
- name: Setup Node
33-
uses: actions/setup-node@v3
36+
uses: actions/setup-node@v4
3437
with:
35-
node-version: '18'
38+
node-version: '20'
39+
3640
- name: Setup python
37-
uses: actions/setup-python@v4
41+
uses: actions/setup-python@v5
3842
with:
39-
python-version: '3.7'
43+
python-version: '3.11'
4044
cache: 'pip'
45+
4146
- name: Configure AWS Credentials
4247
uses: aws-actions/configure-aws-credentials@v4
4348
with:
4449
audience: sts.amazonaws.com
4550
role-to-assume: arn:aws:iam::395594542180:role/github-actions-deploy
4651
aws-region: us-east-1
52+
4753
- name: Cache Go modules
48-
uses: actions/cache@v2
54+
uses: actions/cache@v3
4955
with:
5056
path: ${{ github.workspace }}/go/pkg/mod
5157
key: ${{ runner.os }}-go-${{ hashFiles('**/go.sum') }}
@@ -64,19 +70,25 @@ jobs:
6470
- name: Python Setup
6571
working-directory: cla-backend
6672
run: |
73+
python -m venv .venv
74+
source .venv/bin/activate
6775
pip install --upgrade pip
6876
pip install -r requirements.txt
6977
70-
71-
7278
- name: Python Lint
7379
working-directory: cla-backend
7480
run: |
81+
python -m venv .venv
82+
source .venv/bin/activate
83+
pip install --upgrade pylint
7584
pylint cla/*.py || true
7685
7786
- name: Python Test
7887
working-directory: cla-backend
7988
run: |
89+
python -m venv .venv
90+
source .venv/bin/activate
91+
pip install --upgrade pytest py pytest-cov pytest-clarity
8092
pytest "cla/tests" -p no:warnings
8193
env:
8294
PLATFORM_GATEWAY_URL: https://api-gw.dev.platform.linuxfoundation.org
@@ -106,8 +118,7 @@ jobs:
106118
107119
- name: Go Test
108120
working-directory: cla-backend-go
109-
run: |
110-
make test
121+
run: make test
111122

112123
- name: Go Lint
113124
working-directory: cla-backend-go
@@ -126,7 +137,6 @@ jobs:
126137
cp ../cla-backend-go/bin/zipbuilder-lambda bin/
127138
cp ../cla-backend-go/bin/gitlab-repository-check-lambda bin/
128139
129-
130140
- name: EasyCLA v1 Deployment us-east-1
131141
working-directory: cla-backend
132142
run: |
@@ -142,6 +152,7 @@ jobs:
142152
if [[ ! -f serverless.yml ]]; then echo "Missing serverless.yml file. Exiting..."; exit 1; fi
143153
if [[ ! -f serverless-authorizer.yml ]]; then echo "Missing serverless-authorizer.yml file. Exiting..."; exit 1; fi
144154
yarn sls deploy --force --stage ${STAGE} --region us-east-1 --verbose
155+
145156
- name: EasyCLA v1 Service Check
146157
run: |
147158
sudo apt install curl jq -y
@@ -176,14 +187,15 @@ jobs:
176187
echo "Failed to get a successful response from endpoint: ${v3_url}"
177188
exit ${exit_code}
178189
fi
190+
179191
- name: EasyCLA v2 Deployment us-east-2
180192
working-directory: cla-backend-go
181193
run: |
182194
if [[ ! -f bin/backend-aws-lambda ]]; then echo "Missing bin/backend-aws-lambda binary file. Exiting..."; exit 1; fi
183195
if [[ ! -f bin/user-subscribe-lambda ]]; then echo "Missing bin/user-subscribe-lambda binary file. Exiting..."; exit 1; fi
184196
rm -rf ./node_modules/
185197
yarn install
186-
yarn sls deploy --force --stage ${STAGE} --region us-east-2
198+
yarn sls deploy --force --stage ${STAGE} --region us-east-2 --verbose
187199
188200
- name: EasyCLA v2 Service Check
189201
run: |

‎.github/workflows/deploy-prod.yml‎

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -24,22 +24,21 @@ jobs:
2424
runs-on: ubuntu-latest
2525
environment: prod
2626
steps:
27-
- uses: actions/checkout@v3
27+
- uses: actions/checkout@v4
2828
- name: Setup go
29-
uses: actions/setup-go@v3
29+
uses: actions/setup-go@v5
3030
with:
31-
go-version: '1.20.1'
32-
check-latest: true
31+
go-version: '1.22'
3332
- name: Go Version
3433
run: go version
3534
- name: Setup Node
36-
uses: actions/setup-node@v3
35+
uses: actions/setup-node@v4
3736
with:
38-
node-version: '18'
37+
node-version: '20'
3938
- name: Setup python
40-
uses: actions/setup-python@v4
39+
uses: actions/setup-python@v5
4140
with:
42-
python-version: '3.7'
41+
python-version: '3.11'
4342
cache: 'pip'
4443
- name: Configure AWS Credentials
4544
uses: aws-actions/configure-aws-credentials@v4
@@ -48,7 +47,7 @@ jobs:
4847
role-to-assume: arn:aws:iam::716487311010:role/github-actions-deploy
4948
aws-region: us-east-1
5049
- name: Cache Go modules
51-
uses: actions/cache@v2
50+
uses: actions/cache@v3
5251
with:
5352
path: ${{ github.workspace }}/go/pkg/mod
5453
key: ${{ runner.os }}-go-${{ hashFiles('**/go.sum') }}
@@ -67,6 +66,8 @@ jobs:
6766
- name: Python Setup
6867
working-directory: cla-backend
6968
run: |
69+
python -m venv .venv
70+
source .venv/bin/activate
7071
pip install --upgrade pip
7172
pip install -r requirements.txt
7273
@@ -117,6 +118,7 @@ jobs:
117118
if [[ ! -f serverless.yml ]]; then echo "Missing serverless.yml file. Exiting..."; exit 1; fi
118119
if [[ ! -f serverless-authorizer.yml ]]; then echo "Missing serverless-authorizer.yml file. Exiting..."; exit 1; fi
119120
yarn sls deploy --force --stage ${STAGE} --region us-east-1 --verbose
121+
120122
- name: EasyCLA v1 Service Check
121123
run: |
122124
sudo apt install curl jq -y

‎.github/workflows/deploy-staging.yml‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ on:
1212

1313
permissions:
1414
# These permissions are needed to interact with GitHub's OIDC Token endpoint to fetch/set the AWS deployment credentials.
15+
# LG: 2025-02-11: this is outdated and not used - needs to be updated and made similar to deploy-dev.yml or deploy-prod.yml
1516
id-token: write
1617
contents: read
1718

@@ -39,7 +40,7 @@ jobs:
3940
- name: Setup python
4041
uses: actions/setup-python@v4
4142
with:
42-
python-version: '3.7'
43+
python-version: '3.8'
4344
cache: 'pip'
4445
- name: Configure AWS Credentials
4546
uses: aws-actions/configure-aws-credentials@v4
@@ -48,7 +49,7 @@ jobs:
4849
role-to-assume: arn:aws:iam::844390194980:role/github-actions-deploy
4950
aws-region: us-east-1
5051
- name: Cache Go modules
51-
uses: actions/cache@v2
52+
uses: actions/cache@v3
5253
with:
5354
path: ${{ github.workspace }}/go/pkg/mod
5455
key: ${{ runner.os }}-go-${{ hashFiles('**/go.sum') }}

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,11 @@ jobs:
1515
runs-on: ubuntu-latest
1616
environment: dev
1717
steps:
18-
- uses: actions/checkout@v3
18+
- uses: actions/checkout@v4
1919
- name: Setup Node
20-
uses: actions/setup-node@v3
20+
uses: actions/setup-node@v4
2121
with:
22-
node-version: '16'
22+
node-version: '20'
2323
- name: Setup
2424
run: yarn install
2525
- name: Yarn Audit

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,11 @@ jobs:
1515
runs-on: ubuntu-latest
1616
environment: dev
1717
steps:
18-
- uses: actions/checkout@v3
18+
- uses: actions/checkout@v4
1919
- name: Setup Node
20-
uses: actions/setup-node@v3
20+
uses: actions/setup-node@v4
2121
with:
22-
node-version: '16'
22+
node-version: '20'
2323
- name: Setup
2424
run: yarn install
2525
- name: Yarn Audit

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

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -115,12 +115,7 @@ func init() {
115115
githubOrganizationsService := github_organizations.NewService(githubOrganizationsRepo, repositoriesRepo, projectClaGroupRepo)
116116
repositoriesService := repositories.NewService(repositoriesRepo, githubOrganizationsRepo, projectClaGroupRepo)
117117

118-
gerritService := gerrits.NewService(gerritRepo, &gerrits.LFGroup{
119-
LfBaseURL: configFile.LFGroup.ClientURL,
120-
ClientID: configFile.LFGroup.ClientID,
121-
ClientSecret: configFile.LFGroup.ClientSecret,
122-
RefreshToken: configFile.LFGroup.RefreshToken,
123-
})
118+
gerritService := gerrits.NewService(gerritRepo)
124119
// Services
125120
projectService := service.NewService(projectRepo, repositoriesRepo, gerritRepo, projectClaGroupRepo, usersRepo)
126121

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

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -137,12 +137,7 @@ func Handler(ctx context.Context) error {
137137
v1ProjectClaGroupRepo,
138138
})
139139

140-
gerritService := gerrits.NewService(gerritRepo, &gerrits.LFGroup{
141-
LfBaseURL: configFile.LFGroup.ClientURL,
142-
ClientID: configFile.LFGroup.ClientID,
143-
ClientSecret: configFile.LFGroup.ClientSecret,
144-
RefreshToken: configFile.LFGroup.RefreshToken,
145-
})
140+
gerritService := gerrits.NewService(gerritRepo)
146141

147142
approvalsTableName := "cla-" + stage + "-approvals"
148143

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ func init() {
8181
v1ProjectClaGroupRepo,
8282
})
8383
ghOrgRepo = github_organizations.NewRepository(awsSession, stage)
84-
gerritService = gerrits.NewService(gerritsRepo, nil)
84+
gerritService = gerrits.NewService(gerritsRepo)
8585
signatureRepo = signatures.NewRepository(awsSession, stage, companyRepo, usersRepo, eventsService, &ghRepo, ghOrgRepo, gerritService, approvalRepo)
8686

8787
log.Info("initialized repositories\n")

0 commit comments

Comments
 (0)