Skip to content

Commit 0f9fede

Browse files
author
Kranti Talluri
committed
[Librarian] Regenerated @ Merge
1 parent 4e61422 commit 0f9fede

File tree

33 files changed

+669
-285
lines changed

33 files changed

+669
-285
lines changed

‎CHANGES.md

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,18 @@ twilio-python Changelog
33

44
Here you can see the full list of changes between each twilio-python release.
55

6+
[2019-07-24] Version 6.29.2
7+
----------------------------
8+
**Insights**
9+
- Added `properties` to summary.
10+
11+
**Preview**
12+
- Added endpoint to brand a call without initiating it, so it can be initiated manually by the Customer
13+
14+
**Twiml**
15+
- Update `<Conference>` recording events **(breaking change)**
16+
17+
618
[2019-07-10] Version 6.29.1
719
----------------------------
820
**Api**

‎tests/integration/api/v2010/account/conference/test_participant.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ def test_mute_participant_response(self):
7979
"date_created": "Fri, 18 Feb 2011 21:07:19 +0000",
8080
"date_updated": "Fri, 18 Feb 2011 21:07:19 +0000",
8181
"end_conference_on_exit": false,
82-
"muted": false,
82+
"muted": true,
8383
"hold": false,
8484
"status": "complete",
8585
"start_conference_on_enter": true,

‎tests/integration/insights/v1/test_summary.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,7 @@ def test_fetch_response(self):
5151
"tags"
5252
],
5353
"attributes": {},
54+
"properties": {},
5455
"url": "https://insights.twilio.com/v1/Voice/CAaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/Summary"
5556
}
5657
'''

‎tests/integration/preview/trusted_comms/test_branded_call.py

Lines changed: 54 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,54 @@
1+
# coding=utf-8
2+
r"""
3+
This code was generated by
4+
\ / _ _ _| _ _
5+
| (_)\/(_)(_|\/| |(/_ v1.0.0
6+
/ /
7+
"""
8+
9+
from tests import IntegrationTestCase
10+
from tests.holodeck import Request
11+
from twilio.base.exceptions import TwilioException
12+
from twilio.http.response import Response
13+
14+
15+
class BrandedCallTestCase(IntegrationTestCase):
16+
17+
def test_create_request(self):
18+
self.holodeck.mock(Response(500, ''))
19+
20+
with self.assertRaises(TwilioException):
21+
self.client.preview.trusted_comms.branded_calls.create(from_="from", to="to", reason="reason")
22+
23+
values = {'From': "from", 'To': "to", 'Reason': "reason", }
24+
25+
self.holodeck.assert_has_request(Request(
26+
'post',
27+
'https://preview.twilio.com/TrustedComms/Business/BrandedCalls',
28+
data=values,
29+
))
30+
31+
def test_create_response(self):
32+
self.holodeck.mock(Response(
33+
201,
34+
'''
35+
{
36+
"account_sid": "ACaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa",
37+
"bg_color": "#fff",
38+
"caller": "Owl Bank",
39+
"created_at": "2019-05-01T20:00:00Z",
40+
"font_color": "#000",
41+
"from": "+15000000000",
42+
"logo": "https://www.twilio.com/marketing/bundles/company/img/logos/red/twilio-logo-red.png",
43+
"reason": "Hello Jhon, your appointment has been confirmed.",
44+
"status": "unknown",
45+
"to": "+573000000000",
46+
"use_case": "conversational",
47+
"url": "https://preview.twilio.com/TrustedComms/Business/BrandedCalls"
48+
}
49+
'''
50+
))
51+
52+
actual = self.client.preview.trusted_comms.branded_calls.create(from_="from", to="to", reason="reason")
53+
54+
self.assertIsNotNone(actual)

‎tests/integration/serverless/v1/service/asset/test_asset_version.py

Lines changed: 0 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,6 @@ def test_fetch_response(self):
7676
"asset_sid": "ZH00000000000000000000000000000000",
7777
"path": "test-path",
7878
"visibility": "public",
79-
"pre_signed_upload_url": null,
8079
"date_created": "2018-11-10T20:00:00Z",
8180
"url": "https://serverless.twilio.com/v1/Services/ZS00000000000000000000000000000000/Assets/ZH00000000000000000000000000000000/Versions/ZN00000000000000000000000000000000"
8281
}
@@ -88,48 +87,3 @@ def test_fetch_response(self):
8887
.asset_versions(sid="ZNXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX").fetch()
8988

9089
self.assertIsNotNone(actual)
91-
92-
def test_create_request(self):
93-
self.holodeck.mock(Response(500, ''))
94-
95-
with self.assertRaises(TwilioException):
96-
self.client.serverless.v1.services(sid="ZSXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX") \
97-
.assets(sid="ZHXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX") \
98-
.asset_versions.create(path="path", visibility="public")
99-
100-
values = {'Path': "path", 'Visibility': "public", }
101-
102-
self.holodeck.assert_has_request(Request(
103-
'post',
104-
'https://serverless.twilio.com/v1/Services/ZSXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX/Assets/ZHXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX/Versions',
105-
data=values,
106-
))
107-
108-
def test_create_response(self):
109-
self.holodeck.mock(Response(
110-
201,
111-
'''
112-
{
113-
"sid": "ZN00000000000000000000000000000000",
114-
"account_sid": "ACaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa",
115-
"service_sid": "ZS00000000000000000000000000000000",
116-
"asset_sid": "ZH00000000000000000000000000000000",
117-
"path": "/some/sample/path",
118-
"visibility": "private",
119-
"date_created": "2018-11-10T20:00:00Z",
120-
"pre_signed_upload_url": {
121-
"url": "https://s3.amazonaws.com/com.twilio.dev.serverless",
122-
"expiration": "2019-01-01T00:08:00.000Z",
123-
"method": "PUT",
124-
"kmsARN": "arn:aws:kms:us-east-1:719084529295:key/2a7bf064-c88c-4fdd-b376-625d7bcd2d98"
125-
},
126-
"url": "https://serverless.twilio.com/v1/Services/ZS00000000000000000000000000000000/Assets/ZH00000000000000000000000000000000/Versions/ZN00000000000000000000000000000000"
127-
}
128-
'''
129-
))
130-
131-
actual = self.client.serverless.v1.services(sid="ZSXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX") \
132-
.assets(sid="ZHXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX") \
133-
.asset_versions.create(path="path", visibility="public")
134-
135-
self.assertIsNotNone(actual)

‎tests/integration/serverless/v1/service/environment/test_variable.py

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -165,3 +165,28 @@ def test_update_response(self):
165165
.variables(sid="ZVXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX").update()
166166

167167
self.assertIsNotNone(actual)
168+
169+
def test_delete_request(self):
170+
self.holodeck.mock(Response(500, ''))
171+
172+
with self.assertRaises(TwilioException):
173+
self.client.serverless.v1.services(sid="ZSXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX") \
174+
.environments(sid="ZEXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX") \
175+
.variables(sid="ZVXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX").delete()
176+
177+
self.holodeck.assert_has_request(Request(
178+
'delete',
179+
'https://serverless.twilio.com/v1/Services/ZSXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX/Environments/ZEXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX/Variables/ZVXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX',
180+
))
181+
182+
def test_delete_response(self):
183+
self.holodeck.mock(Response(
184+
204,
185+
None,
186+
))
187+
188+
actual = self.client.serverless.v1.services(sid="ZSXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX") \
189+
.environments(sid="ZEXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX") \
190+
.variables(sid="ZVXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX").delete()
191+
192+
self.assertTrue(actual)

‎tests/integration/serverless/v1/service/function/test_function_version.py

Lines changed: 0 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,6 @@ def test_fetch_response(self):
7676
"function_sid": "ZH00000000000000000000000000000000",
7777
"path": "test-path",
7878
"visibility": "public",
79-
"pre_signed_upload_url": null,
8079
"date_created": "2018-11-10T20:00:00Z",
8180
"url": "https://serverless.twilio.com/v1/Services/ZS00000000000000000000000000000000/Functions/ZH00000000000000000000000000000000/Versions/ZN00000000000000000000000000000000"
8281
}
@@ -88,48 +87,3 @@ def test_fetch_response(self):
8887
.function_versions(sid="ZNXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX").fetch()
8988

9089
self.assertIsNotNone(actual)
91-
92-
def test_create_request(self):
93-
self.holodeck.mock(Response(500, ''))
94-
95-
with self.assertRaises(TwilioException):
96-
self.client.serverless.v1.services(sid="ZSXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX") \
97-
.functions(sid="ZHXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX") \
98-
.function_versions.create(path="path", visibility="public")
99-
100-
values = {'Path': "path", 'Visibility': "public", }
101-
102-
self.holodeck.assert_has_request(Request(
103-
'post',
104-
'https://serverless.twilio.com/v1/Services/ZSXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX/Functions/ZHXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX/Versions',
105-
data=values,
106-
))
107-
108-
def test_create_response(self):
109-
self.holodeck.mock(Response(
110-
201,
111-
'''
112-
{
113-
"sid": "ZN00000000000000000000000000000000",
114-
"account_sid": "ACaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa",
115-
"service_sid": "ZS00000000000000000000000000000000",
116-
"function_sid": "ZH00000000000000000000000000000000",
117-
"path": "/some/sample/path",
118-
"visibility": "protected",
119-
"date_created": "2018-11-10T20:00:00Z",
120-
"pre_signed_upload_url": {
121-
"url": "https://s3.amazonaws.com/com.twilio.dev.serverless",
122-
"expiration": "2019-01-01T00:08:00.000Z",
123-
"method": "PUT",
124-
"kmsARN": "arn:aws:kms:us-east-1:719084529295:key/2a7bf064-c88c-4fdd-b376-625d7bcd2d98"
125-
},
126-
"url": "https://serverless.twilio.com/v1/Services/ZS00000000000000000000000000000000/Functions/ZH00000000000000000000000000000000/Versions/ZN00000000000000000000000000000000"
127-
}
128-
'''
129-
))
130-
131-
actual = self.client.serverless.v1.services(sid="ZSXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX") \
132-
.functions(sid="ZHXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX") \
133-
.function_versions.create(path="path", visibility="public")
134-
135-
self.assertIsNotNone(actual)

‎tests/integration/serverless/v1/service/test_asset.py

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -86,6 +86,29 @@ def test_fetch_response(self):
8686

8787
self.assertIsNotNone(actual)
8888

89+
def test_delete_request(self):
90+
self.holodeck.mock(Response(500, ''))
91+
92+
with self.assertRaises(TwilioException):
93+
self.client.serverless.v1.services(sid="ZSXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX") \
94+
.assets(sid="ZHXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX").delete()
95+
96+
self.holodeck.assert_has_request(Request(
97+
'delete',
98+
'https://serverless.twilio.com/v1/Services/ZSXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX/Assets/ZHXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX',
99+
))
100+
101+
def test_delete_response(self):
102+
self.holodeck.mock(Response(
103+
204,
104+
None,
105+
))
106+
107+
actual = self.client.serverless.v1.services(sid="ZSXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX") \
108+
.assets(sid="ZHXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX").delete()
109+
110+
self.assertTrue(actual)
111+
89112
def test_create_request(self):
90113
self.holodeck.mock(Response(500, ''))
91114

‎tests/integration/serverless/v1/service/test_environment.py

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -132,3 +132,26 @@ def test_create_response(self):
132132
.environments.create(unique_name="unique_name")
133133

134134
self.assertIsNotNone(actual)
135+
136+
def test_delete_request(self):
137+
self.holodeck.mock(Response(500, ''))
138+
139+
with self.assertRaises(TwilioException):
140+
self.client.serverless.v1.services(sid="ZSXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX") \
141+
.environments(sid="ZEXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX").delete()
142+
143+
self.holodeck.assert_has_request(Request(
144+
'delete',
145+
'https://serverless.twilio.com/v1/Services/ZSXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX/Environments/ZEXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX',
146+
))
147+
148+
def test_delete_response(self):
149+
self.holodeck.mock(Response(
150+
204,
151+
None,
152+
))
153+
154+
actual = self.client.serverless.v1.services(sid="ZSXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX") \
155+
.environments(sid="ZEXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX").delete()
156+
157+
self.assertTrue(actual)

‎tests/integration/serverless/v1/service/test_function.py

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -86,6 +86,29 @@ def test_fetch_response(self):
8686

8787
self.assertIsNotNone(actual)
8888

89+
def test_delete_request(self):
90+
self.holodeck.mock(Response(500, ''))
91+
92+
with self.assertRaises(TwilioException):
93+
self.client.serverless.v1.services(sid="ZSXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX") \
94+
.functions(sid="ZHXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX").delete()
95+
96+
self.holodeck.assert_has_request(Request(
97+
'delete',
98+
'https://serverless.twilio.com/v1/Services/ZSXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX/Functions/ZHXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX',
99+
))
100+
101+
def test_delete_response(self):
102+
self.holodeck.mock(Response(
103+
204,
104+
None,
105+
))
106+
107+
actual = self.client.serverless.v1.services(sid="ZSXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX") \
108+
.functions(sid="ZHXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX").delete()
109+
110+
self.assertTrue(actual)
111+
89112
def test_create_request(self):
90113
self.holodeck.mock(Response(500, ''))
91114

‎tests/integration/serverless/v1/test_service.py

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -86,6 +86,27 @@ def test_fetch_response(self):
8686

8787
self.assertIsNotNone(actual)
8888

89+
def test_delete_request(self):
90+
self.holodeck.mock(Response(500, ''))
91+
92+
with self.assertRaises(TwilioException):
93+
self.client.serverless.v1.services(sid="ZSXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX").delete()
94+
95+
self.holodeck.assert_has_request(Request(
96+
'delete',
97+
'https://serverless.twilio.com/v1/Services/ZSXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX',
98+
))
99+
100+
def test_delete_response(self):
101+
self.holodeck.mock(Response(
102+
204,
103+
None,
104+
))
105+
106+
actual = self.client.serverless.v1.services(sid="ZSXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX").delete()
107+
108+
self.assertTrue(actual)
109+
89110
def test_create_request(self):
90111
self.holodeck.mock(Response(500, ''))
91112

‎twilio/rest/authy/__init__.py

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -37,18 +37,18 @@ def v1(self):
3737
return self._v1
3838

3939
@property
40-
def services(self):
40+
def forms(self):
4141
"""
42-
:rtype: twilio.rest.authy.v1.service.ServiceList
42+
:rtype: twilio.rest.authy.v1.form.FormList
4343
"""
44-
return self.v1.services
44+
return self.v1.forms
4545

4646
@property
47-
def forms(self):
47+
def services(self):
4848
"""
49-
:rtype: twilio.rest.authy.v1.form.FormList
49+
:rtype: twilio.rest.authy.v1.service.ServiceList
5050
"""
51-
return self.v1.forms
51+
return self.v1.services
5252

5353
def __repr__(self):
5454
"""

0 commit comments

Comments
 (0)