Skip to content

Commit 11a68fd

Browse files
lukaszgryglickilukaszgryglicki
authored
Merge pull request #4709 from linuxfoundation/unicron-4488-use-v2-svgs
Use V2 SVGs
2 parents fae7ef0 + 0a1fd44 commit 11a68fd

File tree

5 files changed

+36
-13
lines changed

5 files changed

+36
-13
lines changed

‎cla-backend-go/github/github_repository.go‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@ const (
2929
unknown = "Unknown"
3030
failureState = "failure"
3131
successState = "success"
32+
svgVersion = "?v=2"
3233
)
3334

3435
func GetGitHubRepository(ctx context.Context, installationID, githubRepositoryID int64) (*github.Repository, error) {
@@ -505,20 +506,20 @@ func getCommentBadge(allSigned bool, signURL string, missingUserId, managerAppro
505506
var badgeURL string
506507

507508
if allSigned {
508-
badgeURL = fmt.Sprintf("%s/cla-signed.svg", CLALogoURL)
509+
badgeURL = fmt.Sprintf("%s/cla-signed.svg%s", CLALogoURL, svgVersion)
509510
badgeHyperLink = fmt.Sprintf("%s/#/?version=2", CLALandingPage)
510511
alt = "CLA Signed"
511512
return fmt.Sprintf(`<a href="%s"><img src="%s" alt="%s" align="left" height="28" width="328" >`, badgeHyperLink, badgeURL, alt)
512513
}
513514
badgeHyperLink = signURL
514515
if missingUserId {
515-
badgeURL = fmt.Sprintf("%s/cla-missing-id.svg", CLALogoURL)
516+
badgeURL = fmt.Sprintf("%s/cla-missing-id.svg%s", CLALogoURL, svgVersion)
516517
alt = "CLA Missing ID"
517518
} else if managerApproved {
518-
badgeURL = fmt.Sprintf("%s/cla-confirmation-needed.svg", CLALogoURL)
519+
badgeURL = fmt.Sprintf("%s/cla-confirmation-needed.svg%s", CLALogoURL, svgVersion)
519520
alt = "CLA Confirmation Needed"
520521
} else {
521-
badgeURL = fmt.Sprintf("%s/cla-not-signed.svg", CLALogoURL)
522+
badgeURL = fmt.Sprintf("%s/cla-not-signed.svg%s", CLALogoURL, svgVersion)
522523
alt = "CLA Not Signed"
523524
}
524525

‎cla-backend-go/v2/gitlab-activity/service.go‎

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,10 @@ var (
4141
secretTokenMismatch = errors.New("secret token mismatch")
4242
)
4343

44+
const (
45+
svgVersion = "?v=2"
46+
)
47+
4448
// ProcessMergeActivityInput is used to pass the data needed to trigger a gitlab mr check
4549
type ProcessMergeActivityInput struct {
4650
ProjectName string
@@ -317,13 +321,13 @@ func PrepareMrCommentContent(missingUsers []*gatedGitlabUser, signedUsers []*git
317321
}
318322

319323
coveredBadge := fmt.Sprintf(`<a href="%s">
320-
<img src="https://s3.amazonaws.com/cla-project-logo-dev/cla-signed.svg" alt="CLA Signed" align="left" height="28" width="328" ></a><br/>`, badgeHyperlink)
324+
<img src="https://s3.amazonaws.com/cla-project-logo-dev/cla-signed.svg%s" alt="CLA Signed" align="left" height="28" width="328" ></a><br/>`, badgeHyperlink, svgVersion)
321325
failedBadge := fmt.Sprintf(`<a href="%s">
322-
<img src="https://s3.amazonaws.com/cla-project-logo-dev/cla-not-signed.svg" alt="CLA Not Signed" align="left" height="28" width="328" ></a><br/>`, badgeHyperlink)
326+
<img src="https://s3.amazonaws.com/cla-project-logo-dev/cla-not-signed.svg%s" alt="CLA Not Signed" align="left" height="28" width="328" ></a><br/>`, badgeHyperlink, svgVersion)
323327
// missingUserIDBadge := fmt.Sprintf(`<a href="%s">
324-
// <img src="https://s3.amazonaws.com/cla-project-logo-dev/cla-missing-id.svg" alt="CLA Missing ID" align="left" height="28" width="328" ></a><br/>`, badgeHyperlink)
328+
// <img src="https://s3.amazonaws.com/cla-project-logo-dev/cla-missing-id.svg%s" alt="CLA Missing ID" align="left" height="28" width="328" ></a><br/>`, badgeHyperlink, svgVersion)
325329
confirmationNeededBadge := fmt.Sprintf(`<a href="%s">
326-
<img src="https://s3.amazonaws.com/cla-project-logo-dev/cla-confirmation-needed.svg" alt="CLA Confirmation Needed" align="left" height="28" width="328" ></a><br/>`, badgeHyperlink)
330+
<img src="https://s3.amazonaws.com/cla-project-logo-dev/cla-confirmation-needed.svg%s" alt="CLA Confirmation Needed" align="left" height="28" width="328" ></a><br/>`, badgeHyperlink, svgVersion)
327331

328332
var body string
329333

‎cla-backend/cla/utils.py‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
CLA_LOGO_URL = os.environ.get("CLA_BUCKET_LOGO_URL", "")
3737
CORPORATE_BASE = os.environ.get("CLA_CORPORATE_BASE", "")
3838
CORPORATE_V2_BASE = os.environ.get("CLA_CORPORATE_V2_BASE", "")
39-
39+
SVG_VERSION = "?v=2"
4040

4141
def get_cla_path():
4242
"""Returns the CLA code root directory on the current system."""
@@ -913,7 +913,7 @@ def get_comment_badge(
913913

914914
alt = "CLA"
915915
if all_signed:
916-
badge_url = f"{CLA_LOGO_URL}/cla-signed.svg"
916+
badge_url = f"{CLA_LOGO_URL}/cla-signed.svg{SVG_VERSION}"
917917
badge_hyperlink = cla.conf["CLA_LANDING_PAGE"]
918918
badge_hyperlink = os.path.join(badge_hyperlink, "#/")
919919
badge_hyperlink = append_project_version_to_url(address=badge_hyperlink, project_version=project_version)
@@ -927,7 +927,7 @@ def get_comment_badge(
927927
badge_hyperlink = sign_url
928928
text = ""
929929
if missing_user_id:
930-
badge_url = f"{CLA_LOGO_URL}/cla-missing-id.svg"
930+
badge_url = f"{CLA_LOGO_URL}/cla-missing-id.svg{SVG_VERSION}"
931931
alt = "CLA Missing ID"
932932
text = (
933933
f'{text} <a href="{badge_hyperlink}">'
@@ -936,15 +936,15 @@ def get_comment_badge(
936936
)
937937

938938
if is_approved_by_manager:
939-
badge_url = f"{CLA_LOGO_URL}/cla-confirmation-needed.svg"
939+
badge_url = f"{CLA_LOGO_URL}/cla-confirmation-needed.svg{SVG_VERSION}"
940940
alt = "CLA Confirmation Needed"
941941
text = (
942942
f'{text} <a href="{badge_hyperlink}">'
943943
f'<img src="{badge_url}" alt="{alt}" align="left" height="28" width="328">'
944944
"</a>"
945945
)
946946
else:
947-
badge_url = f"{CLA_LOGO_URL}/cla-not-signed.svg"
947+
badge_url = f"{CLA_LOGO_URL}/cla-not-signed.svg{SVG_VERSION}"
948948
alt = "CLA Not Signed"
949949
text = (
950950
f'{text} <a href="{badge_hyperlink}">'

‎utils/lookup_signature_by_reference_id_dd.sh‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
#!/bin/bash
22
# ./utils/lookup_signature_by_reference_id_dd.sh 3777c5a4-0ca8-11ec-9807-4ebaf2d64a25 | jq -r '.Items[].signature_id'
3+
# STAGE=dev ./utils/lookup_signature_by_reference_id_dd.sh $(STAGE=dev ./utils/lookup_user_by_github_username.sh lukaszgryglicki | jq -r '.Items[].user_id.S')
34
if [ -z "$1" ]
45
then
56
echo "$0: you need to specify reference_id as a 1st parameter, for example: '9dcf5bbc-2492-11ed-97c7-3e2a23ea20b5', '55775b48-69c1-474d-a07a-2a329e7012b4', '3777c5a4-0ca8-11ec-9807-4ebaf2d64a25'"

‎utils/lookup_user_by_github_username.sh‎

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
#!/bin/bash
2+
# STAGE=dev ./utils/lookup_user_by_github_username.sh lukaszgryglicki
3+
if [ -z "$1" ]
4+
then
5+
echo "$0: you need to specify GitHub login as a 1st parameter, for example: lukaszgryglicki"
6+
exit 1
7+
fi
8+
if [ -z "${STAGE}" ]
9+
then
10+
export STAGE=dev
11+
fi
12+
13+
if [ ! -z "${DEBUG}" ]
14+
then
15+
echo "aws --profile \"lfproduct-${STAGE}\" dynamodb query --table-name \"cla-${STAGE}-users\" --index-name github-username-index --key-condition-expression \"user_github_username = :github_username\" --expression-attribute-values '{\":github_username\":{\"S\":\"${1}\"}}' | jq -r '.'"
16+
fi
17+
aws --profile "lfproduct-${STAGE}" dynamodb query --table-name "cla-${STAGE}-users" --index-name github-username-index --key-condition-expression "user_github_username = :github_username" --expression-attribute-values "{\":github_username\":{\"S\":\"${1}\"}}" | jq -r '.'

0 commit comments

Comments
 (0)