Update checked in version of gsutil to version 4.6

third_party/boto/bin/elbadmin

 #!/usr/bin/env python
 # Copyright (c) 2009 Chris Moyer http://coredumped.org/
 #
 # Permission is hereby granted, free of charge, to any person obtaining a
 # copy of this software and associated documentation files (the
 # "Software"), to deal in the Software without restriction, including
 # without limitation the rights to use, copy, modify, merge, publish, dis-
 # tribute, sublicense, and/or sell copies of the Software, and to permit
 # persons to whom the Software is furnished to do so, subject to the fol-
 # lowing conditions:
@@ skipping 54 matching lines @@
     return elbs[0]
 
 
 def list(elb):
     """List all ELBs"""
     print "%-20s %s" % ("Name", "DNS Name")
     print "-" * 80
     for b in elb.get_all_load_balancers():
         print "%-20s %s" % (b.name, b.dns_name)
 
+def check_valid_region(conn, region):
+    if conn is None:
+        print 'Invalid region (%s)' % region
+        sys.exit(1)
 
 def get(elb, name):
     """Get details about ELB <name>"""
 
     b = find_elb(elb, name)
     if b:
         print "=" * 80
         print "Name: %s" % b.name
         print "DNS Name: %s" % b.dns_name
         if b.canonical_hosted_zone_name:
@@ skipping 16 matching lines @@
         print
 
         print "  Zones  "
         print "---------"
         for z in b.availability_zones:
             print z
 
         print
 
         # Make map of all instance Id's to Name tags
+        import boto
         if not options.region:
             ec2 = boto.connect_ec2()
         else:
-            import boto.ec2.elb
             ec2 = boto.ec2.connect_to_region(options.region)
+            check_valid_region(ec2, options.region)
 
         instance_health = b.get_instance_health()
         instances = [state.instance_id for state in instance_health]
 
-        names = {}
-        for i in ec2.get_only_instances(instances):
-            names[i.id] = i.tags.get('Name', '')
+        names = dict((k,'') for k in instances)
+        for i in ec2.get_only_instances():
+            if i.id in instances:
+                names[i.id] = i.tags.get('Name', '')
 
         name_column_width = max([4] + [len(v) for k,v in names.iteritems()]) + 2
 
         print "Instances"
         print "---------"
         print "%-12s %-15s %-*s %s" % ("ID",
                                        "STATE",
                                        name_column_width, "NAME",
                                        "DESCRIPTION")
         for state in instance_health:
@@ skipping 114 matching lines @@
 
     if len(args) < 1:
         parser.print_help()
         sys.exit(1)
 
     if not options.region:
         elb = boto.connect_elb()
     else:
         import boto.ec2.elb
         elb = boto.ec2.elb.connect_to_region(options.region)
+        check_valid_region(elb, options.region)
 
     print "%s" % (elb.region.endpoint)
 
     command = args[0].lower()
     if command in ("ls", "list"):
         list(elb)
     elif command == "get":
         get(elb, args[1])
     elif command == "create":
         if not options.listeners:
@@ skipping 18 matching lines @@
     elif command == "addl":
         if not options.listeners:
             print "-l option required for command addl"
             sys.exit(1)
         add_listener(elb, args[1], options.listeners)
     elif command == "rml":
         if not args[2:]:
             print "port required"
             sys.exit(2)
         rm_listener(elb, args[1], args[2:])