Commit59965a4

and

authored

fix: set creds only if transport not provided (#1348)

Co-authored-by: mukund-ananthu <83691193+mukund-ananthu@users.noreply.github.com>

1 parent32d0998 commit59965a4Copy full SHA for 59965a4

File tree

+12

-2

lines changed

+12

-2

lines changed

Lines changed: 5 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -128,11 +128,15 @@ def __init__(`
`128`	`128`	`# Sanity check: Is our goal to use the emulator?`
`129`	`129`	`# If so, create a grpc insecure channel with the emulator host`
`130`	`130`	`# as the target.`
	`131`	`+# TODO(https://github.com/googleapis/python-pubsub/issues/1349): Move the emulator`
	`132`	`+# code below to test files.`
`131`	`133`	`ifos.environ.get("PUBSUB_EMULATOR_HOST"):`
`132`	`134`	`kwargs["client_options"]= {`
`133`	`135`	`"api_endpoint":os.environ.get("PUBSUB_EMULATOR_HOST")`
`134`	`136`	`}`
`135`		`-kwargs["credentials"]=AnonymousCredentials()`
	`137`	`+# Configure credentials directly to transport, if provided.`
	`138`	`+if"transport"notinkwargs:`
	`139`	`+kwargs["credentials"]=AnonymousCredentials()`
`136`	`140`
`137`	`141`	`# For a transient failure, retry publishing the message infinitely.`
`138`	`142`	`self.publisher_options=types.PublisherOptions(*publisher_options)`

Lines changed: 5 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -81,11 +81,15 @@ def __init__(`
`81`	`81`	`# Sanity check: Is our goal to use the emulator?`
`82`	`82`	`# If so, create a grpc insecure channel with the emulator host`
`83`	`83`	`# as the target.`
	`84`	`+# TODO(https://github.com/googleapis/python-pubsub/issues/1349): Move the emulator`
	`85`	`+# code below to test files.`
`84`	`86`	`ifos.environ.get("PUBSUB_EMULATOR_HOST"):`
`85`	`87`	`kwargs["client_options"]= {`
`86`	`88`	`"api_endpoint":os.environ.get("PUBSUB_EMULATOR_HOST")`
`87`	`89`	`}`
`88`		`-kwargs["credentials"]=AnonymousCredentials()`
	`90`	`+# Configure credentials directly to transport, if provided.`
	`91`	`+if"transport"notinkwargs:`
	`92`	`+kwargs["credentials"]=AnonymousCredentials()`
`89`	`93`
`90`	`94`	`# Instantiate the underlying GAPIC client.`
`91`	`95`	`super().__init__(**kwargs)`

Lines changed: 2 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -99,6 +99,8 @@`
`99`	`99`	`ifcount<len(clients_to_patch):`
`100`	`100`	`raiseException(err_msg)`
`101`	`101`
	`102`	`+# TODO(https://github.com/googleapis/python-pubsub/issues/1349): Move the emulator`
	`103`	`+# code below to test files.`
`102`	`104`	`count=s.replace(`
`103`	`105`	`clients_to_patch,`
`104`	`106`	`r"# initialize with the provided callable or the passed in class",`

Comments

(0)