custom user-agent header

nudzo · Oct 8, 2013 · cfc2499 · cfc2499
1 parent 9ca824c
commit cfc2499
Show file tree

Hide file tree

Showing 5 changed files with 30 additions and 2 deletions.
diff --git a/library/cloud/gce b/library/cloud/gce
@@ -150,6 +150,9 @@ EXAMPLES = '''
 
 import sys
 
+USER_AGENT_PRODUCT="Ansible-gce"
+USER_AGENT_VERSION="v1beta15"
+
 try:
     from libcloud.compute.types import Provider
     from libcloud.compute.providers import get_driver
@@ -367,6 +370,8 @@ def main():
 
     try:
         gce = get_driver(Provider.GCE)(*ARGS, datacenter=zone, **KWARGS)
+        gce.connection.user_agent_append("%s/%s" % (
+            USER_AGENT_PRODUCT, USER_AGENT_VERSION))
     except Exception as e:
         module.fail_json(msg=unexpected_error_msg(e), changed=False)
 

diff --git a/library/cloud/gce_lb b/library/cloud/gce_lb
@@ -128,6 +128,9 @@ EXAMPLES = '''
 
 import sys
 
+USER_AGENT_PRODUCT="Ansible-gce_lb"
+USER_AGENT_VERSION="v1beta15"
+
 try:                                                                            
     from libcloud.compute.types import Provider
     from libcloud.compute.providers import get_driver
@@ -202,7 +205,11 @@ def main():
 
     try:
         gce = get_driver(Provider.GCE)(*ARGS, **KWARGS)
+        gce.connection.user_agent_append("%s/%s" % (
+                USER_AGENT_PRODUCT, USER_AGENT_VERSION))
         gcelb = get_driver_lb(Provider_lb.GCE)(gce_driver=gce)
+        gcelb.connection.user_agent_append("%s/%s" % (
+                USER_AGENT_PRODUCT, USER_AGENT_VERSION))
     except Exception as e:
         module.fail_json(msg=unexpected_error_msg(e), changed=False)
 

diff --git a/library/cloud/gce_net b/library/cloud/gce_net
@@ -95,6 +95,9 @@ EXAMPLES = '''
 
 import sys
 
+USER_AGENT_PRODUCT="Ansible-gce_net"
+USER_AGENT_VERSION="v1beta15"
+
 try:                                                                            
     from libcloud.compute.types import Provider                                 
     from libcloud.compute.providers import get_driver                           
@@ -168,6 +171,8 @@ def main():
 
     try:
         gce = get_driver(Provider.GCE)(*ARGS, **KWARGS)
+        gce.connection.user_agent_append("%s/%s" % (
+                USER_AGENT_PRODUCT, USER_AGENT_VERSION))
     except Exception as e:
         module.fail_json(msg=unexpected_error_msg(e), changed=False)
 

diff --git a/library/cloud/gce_pd b/library/cloud/gce_pd
@@ -90,6 +90,9 @@ EXAMPLES = '''
 
 import sys
 
+USER_AGENT_PRODUCT="Ansible-gce_pd"
+USER_AGENT_VERSION="v1beta15"
+
 try:                                                                            
     from libcloud.compute.types import Provider                                 
     from libcloud.compute.providers import get_driver                           
@@ -149,6 +152,8 @@ def main():
 
     try:
         gce = get_driver(Provider.GCE)(*ARGS, datacenter=zone, **KWARGS)
+        gce.connection.user_agent_append("%s/%s" % (
+                USER_AGENT_PRODUCT, USER_AGENT_VERSION))
     except Exception as e:
         module.fail_json(msg=unexpected_error_msg(e), changed=False)
 

diff --git a/plugins/inventory/gce.py b/plugins/inventory/gce.py
@@ -72,6 +72,9 @@
 Version: 0.0.1
 '''
 
+USER_AGENT_PRODUCT="Ansible-gce_inventory_plugin"
+USER_AGENT_VERSION="v1beta15"
+
 import sys
 import os
 import argparse
@@ -146,8 +149,11 @@ def get_gce_driver(self):
                 config.get('gce','gce_service_account_pem_file_path')
             )
             kwargs = {'project': config.get('gce','gce_project_id')}
-
-        return get_driver(Provider.GCE)(*args, **kwargs)
+
+        gce = get_driver(Provider.GCE)(*args, **kwargs)
+        gce.connection.user_agent_append("%s/%s" % (
+                USER_AGENT_PRODUCT, USER_AGENT_VERSION))
+        return gce
 
 
     def parse_cli_args(self):