Merge pull request #2286 from dhermes/upgrade-to-primary-ua

dhermes · web-flow · commit 6b42be945920 · 2016-09-09T09:33:09.000-07:00
Upgrading gRPC user agent from secondary to primary.
diff --git a/google/cloud/_helpers.py b/google/cloud/_helpers.py
@@ -651,7 +651,7 @@ def make_secure_stub(credentials, user_agent, stub_class, host):
         transport_creds, auth_creds)
     target = '%s:%d' % (host, http_client.HTTPS_PORT)
     channel_args = (
-        ('grpc.secondary_user_agent', user_agent),
+        ('grpc.primary_user_agent', user_agent),
     )
     channel = grpc.secure_channel(target, channel_creds,
                                   options=channel_args)
diff --git a/unit_tests/test__helpers.py b/unit_tests/test__helpers.py
@@ -975,7 +975,7 @@ def mock_plugin(*args):
         target = '%s:%d' % (host, http_client.HTTPS_PORT)
         secure_args = (target, COMPOSITE_CREDS)
         secure_kwargs = {
-            'options': (('grpc.secondary_user_agent', user_agent),)
+            'options': (('grpc.primary_user_agent', user_agent),)
         }
         self.assertEqual(grpc_mod.secure_channel_args,
                          (secure_args, secure_kwargs))

Original file line number	Diff line number	Diff line change
`@@ -651,7 +651,7 @@ def make_secure_stub(credentials, user_agent, stub_class, host):`
`651`	`651`	`transport_creds, auth_creds)`
`652`	`652`	`target = '%s:%d' % (host, http_client.HTTPS_PORT)`
`653`	`653`	`channel_args = (`
`654`		`- ('grpc.secondary_user_agent', user_agent),`
	`654`	`+ ('grpc.primary_user_agent', user_agent),`
`655`	`655`	`)`
`656`	`656`	`channel = grpc.secure_channel(target, channel_creds,`
`657`	`657`	`options=channel_args)`
Original file line number	Diff line number	Diff line change
`@@ -975,7 +975,7 @@ def mock_plugin(*args):`
`975`	`975`	`target = '%s:%d' % (host, http_client.HTTPS_PORT)`
`976`	`976`	`secure_args = (target, COMPOSITE_CREDS)`
`977`	`977`	`secure_kwargs = {`
`978`		`- 'options': (('grpc.secondary_user_agent', user_agent),)`
	`978`	`+ 'options': (('grpc.primary_user_agent', user_agent),)`
`979`	`979`	`}`
`980`	`980`	`self.assertEqual(grpc_mod.secure_channel_args,`
`981`	`981`	`(secure_args, secure_kwargs))`