Remove prompt for default project ID

third_party/gsutil/gslib/commands/config.py

 # Copyright 2011 Google Inc. All Rights Reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
 #
 #     http://www.apache.org/licenses/LICENSE-2.0
 #
 # Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS,
@@ skipping 417 matching lines @@
     if hasattr(os, 'O_NOINHERIT'):
       flags |= os.O_NOINHERIT
     try:
       fd = os.open(file_path, flags, 0600)
     except (OSError, IOError), e:
       raise CommandException('Failed to open %s for writing: %s' %
                              (file_path, e))
     return os.fdopen(fd, 'w')
 
   def _WriteBotoConfigFile(self, config_file, use_oauth2=True,
-      launch_browser=True, oauth2_scopes=[SCOPE_FULL_CONTROL]):
+      oauth2_scopes=[SCOPE_FULL_CONTROL]):
     """Creates a boto config file interactively.
 
     Needed credentials are obtained interactively, either by asking the user for
     access key and secret, or by walking the user through the OAuth2 approval
     flow.
 
     Args:
       config_file: File object to which the resulting config file will be
           written.
       use_oauth2: If True, walk user through OAuth2 approval flow and produce a
           config with an oauth2_refresh_token credential. If false, ask the
           user for access key and secret.
       launch_browser: In the OAuth2 approval flow, attempt to open a browser
           window and navigate to the approval URL.
       oauth2_scopes: A list of OAuth2 scopes to request authorization for, when
           using OAuth2.
     """
 
     # Collect credentials
     provider_map = {'aws': 'aws', 'google': 'gs'}
     uri_map = {'aws': 's3', 'google': 'gs'}
     key_ids = {}
     sec_keys = {}
     if use_oauth2:
       oauth2_refresh_token = oauth2_helper.OAuth2ApprovalFlow(
           oauth2_helper.OAuth2ClientFromBotoConfig(boto.config),
-          oauth2_scopes, launch_browser)
+          oauth2_scopes)
     else:
       got_creds = False
       for provider in provider_map:
         if provider == 'google':
           key_ids[provider] = raw_input('What is your %s access key ID? ' %
                                         provider)
           sec_keys[provider] = raw_input('What is your %s secret access key? ' %
                                          provider)
           got_creds = True
           if not key_ids[provider] or not sec_keys[provider]:
@@ skipping 57 matching lines @@
     # Write the default API version.
     config_file.write("""
 # 'default_api_version' specifies the default Google Cloud Storage API
 # version to use. If not set below gsutil defaults to API version 1.
 """)
     api_version = 2
     if not use_oauth2: api_version = 1
 
     config_file.write('default_api_version = %d\n' % api_version)
 
-    # Write the config file GSUtil section that includes the default
-    # project ID input from the user.
-    if launch_browser:
-      sys.stdout.write(
-          'Attempting to launch a browser to open the Google API console at '
-          'URL: %s\n\n'
-          '[Note: due to a Python bug, you may see a spurious error message '
-          '"object is not\n callable [...] in [...] Popen.__del__" which can '
-          'be ignored.]\n\n' % GOOG_API_CONSOLE_URI)
-      sys.stdout.write(
-          'In your browser you should see the API Console. Click "Storage" and '
-          'look for the value under "Identifying your project\n\n')
-      if not webbrowser.open(GOOG_API_CONSOLE_URI, new=1, autoraise=True):
-        sys.stdout.write(
-            'Launching browser appears to have failed; please navigate a '
-            'browser to the following URL:\n%s\n' % GOOG_API_CONSOLE_URI)
-      # Short delay; webbrowser.open on linux insists on printing out a message
-      # which we don't want to run into the prompt for the auth code.
-      time.sleep(2)
-    else:
-      sys.stdout.write(
-          '\nPlease navigate your browser to %s,\nthen click "Services" on the '
-          'left side panel and ensure you have Google Cloud\nStorage'
-          'activated, then click "Google Cloud Storage" on the left side '
-          'panel and\nfind the "x-goog-project-id" on that page.\n' %
-          GOOG_API_CONSOLE_URI)
-    default_project_id = raw_input('What is your project-id? ')
+    default_project_id = '0'
     project_id_section_prelude = """
 # 'default_project_id' specifies the default Google Cloud Storage project ID to
 # use with the 'mb' and 'ls' commands. If defined it overrides the default value
 # you set in the API Console. Either of these defaults can be overridden
 # by specifying the -p option to the 'mb' and 'ls' commands.
 """
-    if default_project_id:

[M-A Ruel, 2014/04/02 21:29:43]

this change is not necessary.

[Ryan Tseng, 2014/04/02 22:07:03]

I could leave it in but it will be unreachable code.  But if we're optimizing
for minimal diffs then sure.

-      config_file.write('%sdefault_project_id = %s\n\n\n' %
-                        (project_id_section_prelude, default_project_id))
-    else:
-      sys.stderr.write('No default project ID entered. You will need to edit '
-                       'the default_project_id value\nin your boto config file '
-                       'before using "gsutil ls gs://" or "mb" commands'
-                       'with the\ndefault API version (2).\n')
-      config_file.write('%s#default_project_id = <value>\n\n\n' %
-                        project_id_section_prelude)
+    config_file.write('%sdefault_project_id = %s\n\n\n' %
+                      (project_id_section_prelude, default_project_id))
 
     # Write the config file OAuth2 section.
     config_file.write(CONFIG_OAUTH2_CONFIG_CONTENT)
 
   # Command entry point.
   def RunCommand(self):
     scopes = []
     use_oauth2 = True
     launch_browser = False
     output_file_name = None
@@ skipping 20 matching lines @@
           'see README for details);\n'
           'you are running Python %s.\nUse "gsutil config -a" to create a '
           'config with Developer Key authentication credentials.' % sys.version)
 
     if not scopes:
       scopes.append(SCOPE_FULL_CONTROL)
 
     if output_file_name is None:
       # Check to see if a default config file name is requested via
       # environment variable. If so, use it, otherwise use the hard-coded
-      # default file. Then use the default config file name, if it doesn't 

[M-A Ruel, 2014/04/02 21:29:43]

I'd recommend to not change third party whitespaces.

[Ryan Tseng, 2014/04/02 22:07:03]

Done.

-      # exist or can be moved out of the way without clobbering an existing 
+      # default file. Then use the default config file name, if it doesn't
+      # exist or can be moved out of the way without clobbering an existing
       # backup file.
       boto_config_from_env = os.environ.get('BOTO_CONFIG', None)
       if boto_config_from_env:
         default_config_path = boto_config_from_env
       else:
         default_config_path = os.path.expanduser(os.path.join('~', '.boto'))
       if not os.path.exists(default_config_path):
         output_file_name = default_config_path
         default_config_path_bak = None
       else:
@@ skipping 11 matching lines @@
           except e:
             raise CommandException('Failed to back up existing config '
                 'file ("%s" -> "%s"): %s.'
                 % (default_config_path, default_config_path_bak, e))
           output_file_name = default_config_path
 
     if output_file_name == '-':
       output_file = sys.stdout
     else:
       output_file = self._OpenConfigFile(output_file_name)
-      sys.stderr.write(
-          'This script will create a boto config file at\n%s\ncontaining your '
-          'credentials, based on your responses to the following questions.\n\n'
-          % output_file_name)
 
     # Catch ^C so we can restore the backup.
     signal.signal(signal.SIGINT, cleanup_handler)
     try:
       self._WriteBotoConfigFile(output_file, use_oauth2=use_oauth2,
-          launch_browser=launch_browser, oauth2_scopes=scopes)
+          oauth2_scopes=scopes)
     except Exception, e:
       user_aborted = isinstance(e, AbortException)
       if user_aborted:
         sys.stderr.write('\nCaught ^C; cleaning up\n')
       # If an error occurred during config file creation, remove the invalid
       # config file and restore the backup file.
       if output_file_name != '-':
         output_file.close()
         os.unlink(output_file_name)
         if default_config_path_bak:
           sys.stderr.write('Restoring previous backed up file (%s)\n' %
                            default_config_path_bak)
           os.rename(default_config_path_bak, output_file_name)
       raise
 
     if output_file_name != '-':
       output_file.close()
       sys.stderr.write(
-          '\nBoto config file "%s" created.\nIf you need to use a proxy to '
-          'use a proxy to access the Internet please see the instructions in '
-          'that file.\n' % output_file_name)
+          '\nBoto config file "%s" created.\n' % output_file_name)
 
     return 0
 
 def cleanup_handler(signalnum, handler):
   raise AbortException('User interrupted config command')