Skip to content

Commit

Permalink
Merge branch 'main' into monkeytype-auto-annotate
Browse files Browse the repository at this point in the history
  • Loading branch information
whabanks authored Jun 14, 2024
2 parents a3c2910 + 4ad86fd commit d9de225
Show file tree
Hide file tree
Showing 44 changed files with 690 additions and 2,812 deletions.
1 change: 1 addition & 0 deletions .env.example
Original file line number Diff line number Diff line change
Expand Up @@ -22,3 +22,4 @@ CONTACT_FORM_EMAIL_ADDRESS = ""

AWS_PINPOINT_SC_POOL_ID=
AWS_PINPOINT_SC_TEMPLATE_IDS=
AWS_PINPOINT_DEFAULT_POOL_ID=
2 changes: 1 addition & 1 deletion .github/workflows/export_github_data.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:
DNS_PROXY_FORWARDTOSENTINEL: "true"
DNS_PROXY_LOGANALYTICSWORKSPACEID: ${{ secrets.LOG_ANALYTICS_WORKSPACE_ID }}
DNS_PROXY_LOGANALYTICSSHAREDKEY: ${{ secrets.LOG_ANALYTICS_WORKSPACE_KEY }}
- uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
- uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4.1.6
- name: Export Data
uses: cds-snc/github-repository-metadata-exporter@main
with:
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/ossf-scorecard.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,12 +20,12 @@ jobs:

steps:
- name: "Checkout code"
uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4.1.6
with:
persist-credentials: false

- name: "Run analysis"
uses: ossf/scorecard-action@50aaf84fb1a9f22255cb8bfb1729f4dd085c838c
uses: ossf/scorecard-action@7699f539c2b9ff754039f0e173fdf1a4e4a1e143
with:
results_file: ossf-results.json
results_format: json
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/s3-backup.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ jobs:
steps:

- name: Checkout
uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4.1.6
with:
fetch-depth: 0 # retrieve all history

Expand Down
25 changes: 24 additions & 1 deletion app/aws/mocks.py
Original file line number Diff line number Diff line change
Expand Up @@ -199,7 +199,7 @@ def pinpoint_successful_callback(reference=None, timestamp=1467074434, destinati
"eventVersion": "1.0",
"eventTimestamp": timestamp,
"isFinal": False,
"originationPhoneNumber": "+18078061258",
"originationPhoneNumber": "+13655550100",
"destinationPhoneNumber": destination,
"isoCountryCode": "CA",
"mcc": "302",
Expand Down Expand Up @@ -245,6 +245,29 @@ def pinpoint_delivered_callback(reference=None, timestamp=1467074434, destinatio
return _pinpoint_callback(body)


def pinpoint_shortcode_delivered_callback(reference=None, timestamp=1467074434, destination="+1XXX5550100"):
body = {
"eventType": "TEXT_SUCCESSFUL",
"eventVersion": "1.0",
"eventTimestamp": timestamp,
"isFinal": True,
"originationPhoneNumber": "555555",
"destinationPhoneNumber": destination,
"isoCountryCode": "CA",
"messageId": reference,
"messageRequestTimestamp": timestamp,
"messageEncoding": "GSM",
"messageType": "TRANSACTIONAL",
"messageStatus": "SUCCESSFUL",
"messageStatusDescription": "Message has been accepted by phone carrier",
"totalMessageParts": 1,
"totalMessagePrice": 0.02183,
"totalCarrierFee": 0.005,
}

return _pinpoint_callback(body)


# Note that 1467074434 = 2016-06-28 00:40:34.558 UTC
def pinpoint_failed_callback(provider_response, reference=None, timestamp=1467074434, destination="+1XXX5550100"):
body = {
Expand Down
Loading

0 comments on commit d9de225

Please sign in to comment.