Merge branch 'development'

packages/google-compute-engine-oslogin/packaging/debian/changelog

@@ -1,3 +1,9 @@
+google-compute-engine-oslogin (1:20190801.00-g1) stable; urgency=medium
+
+  * Correct JSON refcount decrementing.
+
+ -- Google Cloud Team <[email protected]>  Thu, 01 Aug 2019 13:57:16 -0700
+
 google-compute-engine-oslogin (1:20190729.00-g1) stable; urgency=medium
 
   * Remove unnecessary binary search logic.

packages/google-compute-engine-oslogin/packaging/setup_deb.sh

@@ -14,7 +14,7 @@
 # limitations under the License.
 
 NAME="google-compute-engine-oslogin"
-VERSION="20190729.00"
+VERSION="20190801.00"
 
 DEB=$(cut -d. -f1 </etc/debian_version)
 if [[ -z $DEB ]]; then

packages/google-compute-engine-oslogin/packaging/setup_rpm.sh

@@ -15,7 +15,7 @@
 
 
 NAME="google-compute-engine-oslogin"
-VERSION="20190729.00"
+VERSION="20190801.00"
 
 rpm_working_dir=/tmp/rpmpackage/${NAME}-${VERSION}
 working_dir=${PWD}

packages/google-compute-engine-oslogin/src/Makefile

@@ -1,7 +1,7 @@
 SHELL = /bin/sh
 TOPDIR = $(realpath ..)
 
-VERSION = 20190729.00
+VERSION = 20190801.00
 
 CPPFLAGS = -Iinclude -I/usr/include/json-c
 FLAGS = -fPIC -Wall -g

packages/google-compute-engine-oslogin/src/utils.cc

@@ -800,7 +800,7 @@ bool StartSession(const string& email, string* response) {
 
   jobj = json_object_new_object();
   json_object_object_add(jobj, "email", json_object_new_string(email.c_str()));
-  json_object_object_add(jobj, "supportedChallengeTypes", jarr);
+  json_object_object_add(jobj, "supportedChallengeTypes", jarr); // Ownership transferred to jobj.
 
   const char* data;
   data = json_object_to_json_string_ext(jobj, JSON_C_TO_STRING_PLAIN);
@@ -814,7 +814,6 @@ bool StartSession(const string& email, string* response) {
     ret = false;
   }
 
-  json_object_put(jarr);
   json_object_put(jobj);
 
   return ret;
@@ -843,7 +842,7 @@ bool ContinueSession(bool alt, const string& email, const string& user_token,
     jresp = json_object_new_object();
     json_object_object_add(jresp, "credential",
                            json_object_new_string(user_token.c_str()));
-    json_object_object_add(jobj, "proposalResponse", jresp);
+    json_object_object_add(jobj, "proposalResponse", jresp); // Ownership transferred to jobj.
   }
 
   const char* data = NULL;
@@ -859,10 +858,6 @@ bool ContinueSession(bool alt, const string& email, const string& user_token,
   }
 
   json_object_put(jobj);
-  // Match condition where we created this to avoid double-free.
-  if (challenge.type != AUTHZEN && !alt) {
-    json_object_put(jresp);
-  }
 
   return ret;
 }

packages/google-compute-engine/packaging/debian/changelog

@@ -1,3 +1,10 @@
+google-compute-engine (1:20190801.00-g1) stable; urgency=medium
+
+  * Re-enable boto config and drop writing plugin directory.
+  * Fix metadata script retrieval.
+
+ -- Google Cloud Team <[email protected]>  Thu, 01 Aug 2019 14:06:02 -0700
+
 google-compute-engine (1:20190729.00-g1) stable; urgency=medium
 
   * Suport Google Private Access over IPv6.

packages/google-compute-engine/packaging/setup_deb.sh

@@ -14,7 +14,7 @@
 # limitations under the License.
 
 NAME="google-compute-engine"
-VERSION="20190729.00"
+VERSION="20190801.00"
 
 working_dir=${PWD}
 if [[ $(basename "$working_dir") != $NAME ]]; then

packages/google-compute-engine/packaging/setup_rpm.sh

@@ -14,7 +14,7 @@
 # limitations under the License.
 
 NAME="google-compute-engine"
-VERSION="20190729.00"
+VERSION="20190801.00"
 
 rpm_working_dir=/tmp/rpmpackage/${NAME}-${VERSION}
 working_dir=${PWD}

packages/python-google-compute-engine/google_compute_engine/boto/boto_config.py

@@ -35,6 +35,10 @@
 class BotoConfig(object):
   """Creates a boto config file for standalone GSUtil."""
 
+  # WARNING: The path should remain as /etc/boto.cfg in order to not break
+  # tools, such as gsutil, that rely on loading well-known Boto config paths.
+  # If you want to change this, please consult the gsutil team
+  # (GoogleCloudPlatform/gsutil) first.
   boto_config = constants.BOTOCONFDIR + '/etc/boto.cfg'
   boto_config_template = constants.BOTOCONFDIR + '/etc/boto.cfg.template'
   boto_config_script = os.path.abspath(__file__)
@@ -80,10 +84,10 @@ def _CreateConfig(self, project_id):
     config = config_manager.ConfigManager(
         config_file=self.boto_config_template,
         config_header=self.boto_config_header)
-    boto_dir = os.path.dirname(self.boto_config_script)
 
+    # WARNING: If you want to change the contents of this config file, please
+    # consult the gsutil team (GoogleCloudPlatform/gsutil) first.
     config.SetOption('GSUtil', 'default_project_id', project_id)
     config.SetOption('GSUtil', 'default_api_version', '2')
     config.SetOption('GoogleCompute', 'service_account', 'default')
-    config.SetOption('Plugin', 'plugin_directory', boto_dir)
     config.WriteConfig(config_file=self.boto_config)

packages/python-google-compute-engine/google_compute_engine/boto/tests/boto_config_test.py

@@ -53,7 +53,6 @@ def testCreateConfig(self, mock_config, mock_logger, mock_watcher):
         mock.call.set('GSUtil', 'default_project_id', self.project_id),
         mock.call.set('GSUtil', 'default_api_version', '2'),
         mock.call.set('GoogleCompute', 'service_account', 'default'),
-        mock.call.set('Plugin', 'plugin_directory', '/tmp'),
         mock.call.write(config_file='config'),
     ]
     self.assertEqual(mocks.mock_calls, expected_calls)

packages/python-google-compute-engine/google_compute_engine/constants.py

@@ -16,7 +16,6 @@
 """A module for global constants."""
 
 import platform
-import sys
 
 OSLOGIN_CONTROL_SCRIPT = 'google_oslogin_control'
 OSLOGIN_NSS_CACHE_SCRIPT = 'google_oslogin_nss_cache'
@@ -42,8 +41,3 @@
   OSLOGIN_NSS_CACHE = '/etc/oslogin_passwd.cache'
   SYSCONFDIR = '/etc/default'
   SYSLOG_SOCKET = '/dev/log'
-
-if sys.version_info >= (3, 0):
-  SET_BOTO_CONFIG = 'false'
-else:
-  SET_BOTO_CONFIG = 'true'

packages/python-google-compute-engine/google_compute_engine/instance_setup/instance_config.py

@@ -78,7 +78,9 @@ class InstanceConfig(config_manager.ConfigManager):
           'host_key_types': 'ecdsa,ed25519,rsa',
           'optimize_local_ssd': 'true',
           'network_enabled': 'true',
-          'set_boto_config': constants.SET_BOTO_CONFIG,
+          # WARNING: Do not change the value of 'set_boto_config' without first
+          # consulting the gsutil team (GoogleCloudPlatform/gsutil).
+          'set_boto_config': 'true',
           'set_host_keys': 'true',
           'set_multiqueue': 'true',
       },

packages/python-google-compute-engine/google_compute_engine/metadata_scripts/script_retriever.py

@@ -112,12 +112,12 @@ def _DownloadAuthUrl(self, url, dest_dir):
       request = urlrequest.Request(url)
       request.add_unredirected_header('Metadata-Flavor', 'Google')
       request.add_unredirected_header('Authorization', self.token)
-      content = _UrlOpenWithRetry(request).read().decode('utf-8')
+      content = _UrlOpenWithRetry(request).read()
     except Exception as e:
       self.logger.warning('Could not download %s. %s.', url, str(e))
       return None
 
-    with open(dest, 'w') as f:
+    with open(dest, 'wb') as f:
       f.write(content)
 
     return dest

packages/python-google-compute-engine/google_compute_engine/metadata_scripts/tests/script_retriever_test.py

@@ -59,10 +59,10 @@ def testDownloadAuthUrl(self, mock_urlopen, mock_request, mock_tempfile):
     mocked_request.add_unredirected_header.assert_called_with(
         'Authorization', 'bar')
     mock_urlopen.assert_called_with(mocked_request)
-    urlopen_read = mock_urlopen().read(return_value=b'foo').decode()
+    urlopen_read = mock_urlopen().read(return_value=b'foo')
     self.mock_logger.warning.assert_not_called()
 
-    mock_open.assert_called_once_with(self.dest, 'w')
+    mock_open.assert_called_once_with(self.dest, 'wb')
     handle = mock_open()
     handle.write.assert_called_once_with(urlopen_read)
 

packages/python-google-compute-engine/packaging/debian/changelog

@@ -1,3 +1,10 @@
+python-google-compute-engine (1:20190801.00-g1) stable; urgency=medium
+
+  * Re-enable boto config and drop writing plugin directory.
+  * Fix metadata script retrieval.
+
+ -- Google Cloud Team <[email protected]>  Thu, 01 Aug 2019 13:55:46 -0700
+
 python-google-compute-engine (1:20190729.00-g1) stable; urgency=medium
 
   * Support for Google Private Access over IPv6.

packages/python-google-compute-engine/packaging/setup_deb.sh

@@ -14,7 +14,7 @@
 # limitations under the License.
 
 NAME="python-google-compute-engine"
-VERSION="20190729.00"
+VERSION="20190801.00"
 
 working_dir=${PWD}
 if [[ $(basename "$working_dir") != $NAME ]]; then

packages/python-google-compute-engine/packaging/setup_rpm.sh

@@ -14,7 +14,7 @@
 # limitations under the License.
 
 NAME="python-google-compute-engine"
-VERSION="20190729.00"
+VERSION="20190801.00"
 
 rpm_working_dir=/tmp/rpmpackage/${NAME}-${VERSION}
 working_dir=${PWD}

packages/python-google-compute-engine/setup.py

@@ -37,7 +37,7 @@
     name='google-compute-engine',
     packages=setuptools.find_packages(),
     url='https://github.com/GoogleCloudPlatform/compute-image-packages',
-    version='20190729.00',
+    version='20190801.00',
     # Entry points create scripts in /usr/bin that call a function.
     entry_points={
         'console_scripts': [