Commit748c935

arithmetic1728

and

busunkim96

authored

feat(api-core): add client_cert_source to ClientOptions (#17)

* feat(api-core): add client_cert_source to ClientOptions* Update google/api_core/client_options.pyCo-Authored-By: Bu Sun Kim <8822365+busunkim96@users.noreply.github.com>* bump google-auth version* update noxfile.py to fix docs problemCo-authored-by: Bu Sun Kim <8822365+busunkim96@users.noreply.github.com>

1 parent0c2c556 commit748c935Copy full SHA for 748c935

File tree

4 files changed

+42

-9

lines changed

4 files changed

+42

-9

lines changed

`‎google/api_core/client_options.py‎`

Lines changed: 16 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,12 @@`
`24`	`24`	`from google.api_core.client_options import ClientOptions`
`25`	`25`	`from google.cloud.vision_v1 import ImageAnnotatorClient`
`26`	`26`
`27`		`- options = ClientOptions(api_endpoint="foo.googleapis.com")`
	`27`	`+ def get_client_cert():`
	`28`	`+ # code to load client certificate and private key.`
	`29`	`+ return client_cert_bytes, client_private_key_bytes`
	`30`	`+`
	`31`	`+ options = ClientOptions(api_endpoint="foo.googleapis.com",`
	`32`	`+ client_cert_source=get_client_cert)`
`28`	`33`
`29`	`34`	`client = ImageAnnotatorClient(client_options=options)`
`30`	`35`
`@@ -34,7 +39,11 @@`
`34`	`39`
`35`	`40`	`from google.cloud.vision_v1 import ImageAnnotatorClient`
`36`	`41`
`37`		`- client = ImageAnnotatorClient(client_options={"api_endpoint": "foo.googleapis.com"})`
	`42`	`+ client = ImageAnnotatorClient(`
	`43`	`+ client_options={`
	`44`	`+ "api_endpoint": "foo.googleapis.com",`
	`45`	`+ "client_cert_source" : get_client_cert`
	`46`	`+ })`
`38`	`47`
`39`	`48`
`40`	`49`	`"""`
`@@ -45,10 +54,14 @@ class ClientOptions(object):`
`45`	`54`
`46`	`55`	`Args:`
`47`	`56`	`api_endpoint (str): The desired API endpoint, e.g., compute.googleapis.com`
	`57`	`+ client_cert_source (Callable[[], (bytes, bytes)]): An optional callback`
	`58`	`+ which returns client certificate bytes and private key bytes both in`
	`59`	`+ PEM format.`
`48`	`60`	`"""`
`49`	`61`
`50`		`-def__init__(self,api_endpoint=None):`
	`62`	`+def__init__(self,api_endpoint=None,client_cert_source=None):`
`51`	`63`	`self.api_endpoint=api_endpoint`
	`64`	`+self.client_cert_source=client_cert_source`
`52`	`65`
`53`	`66`	`def__repr__(self):`
`54`	`67`	`return"ClientOptions: "+repr(self.__dict__)`

`‎noxfile.py‎`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -112,7 +112,7 @@ def docs(session):`
`112`	`112`
`113`	`113`	`session.install(".","grpcio >= 1.8.2","grpcio-gcp >= 0.2.2")`
`114`	`114`	`session.install("-e",".")`
`115`		`-session.install("sphinx","alabaster","recommonmark")`
	`115`	`+session.install("sphinx < 3.0","alabaster","recommonmark")`
`116`	`116`
`117`	`117`	`shutil.rmtree(os.path.join("docs","_build"),ignore_errors=True)`
`118`	`118`	`session.run(`

`‎setup.py‎`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -31,7 +31,7 @@`
`31`	`31`	`dependencies= [`
`32`	`32`	`"googleapis-common-protos >= 1.6.0, < 2.0dev",`
`33`	`33`	`"protobuf >= 3.4.0",`
`34`		`-"google-auth >=0.4.0, < 2.0dev",`
	`34`	`+"google-auth >=1.14.0, < 2.0dev",`
`35`	`35`	`"requests >= 2.18.0, < 3.0.0dev",`
`36`	`36`	`"setuptools >= 34.0.0",`
`37`	`37`	`"six >= 1.10.0",`

`‎tests/unit/test_client_options.py‎`

Lines changed: 24 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -17,26 +17,46 @@`
`17`	`17`	`fromgoogle.api_coreimportclient_options`
`18`	`18`
`19`	`19`
	`20`	`+defget_client_cert():`
	`21`	`+returnb"cert",b"key"`
	`22`	`+`
	`23`	`+`
`20`	`24`	`deftest_constructor():`
`21`		`-options=client_options.ClientOptions(api_endpoint="foo.googleapis.com")`
	`25`	`+`
	`26`	`+options=client_options.ClientOptions(`
	`27`	`+api_endpoint="foo.googleapis.com",client_cert_source=get_client_cert`
	`28`	`+ )`
`22`	`29`
`23`	`30`	`assertoptions.api_endpoint=="foo.googleapis.com"`
	`31`	`+assertoptions.client_cert_source()== (b"cert",b"key")`
`24`	`32`
`25`	`33`
`26`	`34`	`deftest_from_dict():`
`27`		`-options=client_options.from_dict({"api_endpoint":"foo.googleapis.com"})`
	`35`	`+options=client_options.from_dict(`
	`36`	`+ {"api_endpoint":"foo.googleapis.com","client_cert_source":get_client_cert}`
	`37`	`+ )`
`28`	`38`
`29`	`39`	`assertoptions.api_endpoint=="foo.googleapis.com"`
	`40`	`+# assert options.client_cert_source == get_client_cert`
	`41`	`+assertoptions.client_cert_source()== (b"cert",b"key")`
`30`	`42`
`31`	`43`
`32`	`44`	`deftest_from_dict_bad_argument():`
`33`	`45`	`withpytest.raises(ValueError):`
`34`	`46`	`client_options.from_dict(`
`35`		`- {"api_endpoint":"foo.googleapis.com","bad_arg":"1234"}`
	`47`	`+ {`
	`48`	`+"api_endpoint":"foo.googleapis.com",`
	`49`	`+"bad_arg":"1234",`
	`50`	`+"client_cert_source":get_client_cert,`
	`51`	`+ }`
`36`	`52`	`)`
`37`	`53`
`38`	`54`
`39`	`55`	`deftest_repr():`
`40`	`56`	`options=client_options.ClientOptions(api_endpoint="foo.googleapis.com")`
`41`	`57`
`42`		`-assertrepr(options)=="ClientOptions: {'api_endpoint': 'foo.googleapis.com'}"`
	`58`	`+assert (`
	`59`	`+repr(options)`
	`60`	`+=="ClientOptions: {'api_endpoint': 'foo.googleapis.com', 'client_cert_source': None}"`
	`61`	`+or"ClientOptions: {'client_cert_source': None, 'api_endpoint': 'foo.googleapis.com'}"`
	`62`	`+ )`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commit748c935

File tree

4 files changed

4 files changed

`‎google/api_core/client_options.py‎`

`‎noxfile.py‎`

`‎setup.py‎`

`‎tests/unit/test_client_options.py‎`

0 commit comments