Skip to content

Commit c1d6b19

Browse files
Try to fix the deployment 41
Signed-off-by: Lukasz Gryglicki <[email protected]>
1 parent cd286fa commit c1d6b19

File tree

3 files changed

+13
-17
lines changed

3 files changed

+13
-17
lines changed

.github/workflows/deploy-dev.yml

Lines changed: 11 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -123,8 +123,7 @@ jobs:
123123
124124
- name: Go Lint
125125
working-directory: cla-backend-go
126-
run: |
127-
make lint
126+
run: make lint
128127

129128
- name: Setup Deployment
130129
working-directory: cla-backend
@@ -164,6 +163,16 @@ jobs:
164163
declare -r v2_url="https://api.lfcla.${STAGE}.platform.linuxfoundation.org/v2/health"
165164
declare -r v3_url="https://api.lfcla.${STAGE}.platform.linuxfoundation.org/v3/ops/health"
166165
166+
echo "Validating v2 backend using endpoint: ${v2_url}"
167+
curl --fail -XGET ${v2_url}
168+
exit_code=$?
169+
if [[ ${exit_coe} -eq 0 ]]; then
170+
echo "Successful response from endpoint: ${v2_url}"
171+
else
172+
echo "Failed to get a successful response from endpoint: ${v2_url}"
173+
exit ${exit_code}
174+
fi
175+
167176
echo "Validating v3 backend using endpoint: ${v3_url}"
168177
curl --fail -XGET ${v3_url}
169178
exit_code=$?
@@ -181,23 +190,12 @@ jobs:
181190
exit ${exit_code}
182191
fi
183192
184-
echo "Validating v2 backend using endpoint: ${v2_url}"
185-
curl --fail -XGET ${v2_url}
186-
exit_code=$?
187-
if [[ ${exit_coe} -eq 0 ]]; then
188-
echo "Successful response from endpoint: ${v2_url}"
189-
else
190-
echo "Failed to get a successful response from endpoint: ${v2_url}"
191-
exit ${exit_code}
192-
fi
193-
194193
- name: EasyCLA v2 Deployment us-east-2
195194
working-directory: cla-backend-go
196195
run: |
197196
if [[ ! -f bin/backend-aws-lambda ]]; then echo "Missing bin/backend-aws-lambda binary file. Exiting..."; exit 1; fi
198197
if [[ ! -f bin/user-subscribe-lambda ]]; then echo "Missing bin/user-subscribe-lambda binary file. Exiting..."; exit 1; fi
199198
# rm -rf ./node_modules/
200-
find .
201199
yarn install
202200
yarn sls deploy --force --stage ${STAGE} --region us-east-2 --verbose
203201

cla-backend-go/serverless.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
# SPDX-License-Identifier: MIT
44

55
service: cla-backend-go
6-
frameworkVersion: '^3.29.0'
6+
frameworkVersion: '^3.28.1'
77

88
package:
99
# Exclude all first - selectively add in lambda functions,

cla-backend/cla/config.py

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,12 +13,11 @@
1313
import logging
1414
import os
1515
import sys
16+
from concurrent.futures import ThreadPoolExecutor
1617

1718
from boto3 import client
1819
from botocore.exceptions import ClientError, ProfileNotFound, NoCredentialsError
1920

20-
from concurrent.futures import ThreadPoolExecutor
21-
2221
region = "us-east-1"
2322
ssm_client = client('ssm', region_name=region)
2423

@@ -199,7 +198,6 @@ def _load_single_key(key):
199198
# thread pool of 7 to load fetch the keys
200199
with ThreadPoolExecutor(max_workers=7) as executor:
201200
results = list(executor.map(_load_single_key, keys))
202-
logging.warning(f"got {len(results)} keys")
203201

204202
# set the variable values at the module level so can be imported as cla.config.{VAR_NAME}
205203
for config_key, result in zip(config_keys, results):

0 commit comments

Comments
 (0)