Merge branch 'development'

GoogleCloudPlatform · May 22, 2019 · 14f700e · 14f700e
2 parents d2d5925 + 6f53f95
commit 14f700e
Show file tree

Hide file tree

Showing 14 changed files with 39 additions and 16 deletions.
diff --git a/packages/google-compute-engine-oslogin/Makefile b/packages/google-compute-engine-oslogin/Makefile
@@ -4,7 +4,7 @@ BASENAME = oslogin
 NAME = google-compute-engine-$(BASENAME)
 MAJOR = 1
 MINOR = 5
-REVISION = 2
+REVISION = 3
 
 LIBNSS_CACHE_OSLOGIN = libnss_cache_$(BASENAME)
 LIBNSS_CACHE_OSLOGIN_NAME = libnss_cache_$(NAME)-$(MAJOR).$(MINOR).$(REVISION).so

diff --git a/packages/google-compute-engine-oslogin/bin/google_oslogin_control b/packages/google-compute-engine-oslogin/bin/google_oslogin_control
@@ -13,22 +13,25 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+is_freebsd() {
+  [ "$(uname)" = "FreeBSD" ]
+  return $?
+}
+
 nss_config="/etc/nsswitch.conf"
 pam_sshd_config="/etc/pam.d/sshd"
 pam_su_config="/etc/pam.d/su"
 sshd_config="/etc/ssh/sshd_config"
 group_config="/etc/security/group.conf"
 sudoers_dir="/var/google-sudoers.d"
 users_dir="/var/google-users.d"
-sudoers_file="/etc/sudoers.d/google-oslogin"
 added_comment="# Added by Google Compute Engine OS Login."
 sshd_block="#### Google OS Login control. Do not edit this section. ####"
 sshd_end_block="#### End Google OS Login control section. ####"
-
-is_freebsd() {
-  [ "$(uname)" = "FreeBSD" ]
-  return $?
-}
+sudoers_file="/etc/sudoers.d/google-oslogin"
+if is_freebsd; then
+  sudoers_file="/usr/local/etc/sudoers.d/google-oslogin"
+fi
 
 # Update nsswitch.conf to include OS Login NSS module for passwd.
 modify_nsswitch_conf() {
@@ -97,7 +100,7 @@ modify_sshd_conf() (
   if ! grep -q "$sshd_block" "$sshd_config"; then
     # Remove old-style additions.
     $sed -i"" "/${added_comment}/,+1d" "$sshd_config"
-    /bin/echo -e "\n\n${sshd_block}\n${sshd_end_block}" >> "$sshd_config"
+    printf "\n\n${sshd_block}\n${sshd_end_block}" >> "$sshd_config"
   fi
 
   for entry in "$sshd_auth_keys_command" "$sshd_auth_keys_command_user"; do

diff --git a/packages/google-compute-engine-oslogin/packaging/debian/changelog b/packages/google-compute-engine-oslogin/packaging/debian/changelog
@@ -1,3 +1,9 @@
+google-compute-engine-oslogin (1.5.3-1) unstable; urgency=low
+
+  * Update OS Login control file for FreeBSD support.
+
+ -- Google Cloud Team <[email protected]>  Tue, 22 Nay 2019 12:00:00 -0700
+
 google-compute-engine-oslogin (1.5.2-1) unstable; urgency=low
 
   * Fix pam_group ordering detection.

diff --git a/packages/google-compute-engine-oslogin/packaging/setup_deb.sh b/packages/google-compute-engine-oslogin/packaging/setup_deb.sh
@@ -14,7 +14,7 @@
 # limitations under the License.
 
 NAME="google-compute-engine-oslogin"
-VERSION="1.5.2"
+VERSION="1.5.3"
 
 working_dir=${PWD}
 if [[ $(basename "$working_dir") != $NAME ]]; then

diff --git a/packages/google-compute-engine-oslogin/packaging/setup_rpm.sh b/packages/google-compute-engine-oslogin/packaging/setup_rpm.sh
@@ -15,7 +15,7 @@
 
 
 NAME="google-compute-engine-oslogin"
-VERSION="1.5.2"
+VERSION="1.5.3"
 
 rpm_working_dir=/tmp/rpmpackage/${NAME}-${VERSION}
 working_dir=${PWD}

diff --git a/packages/google-compute-engine/packaging/debian/changelog b/packages/google-compute-engine/packaging/debian/changelog
@@ -1,3 +1,9 @@
+google-compute-engine (2.8.16-1) stable; urgency=low
+
+  * Fix instance setup in Python 3 environments.
+
+ -- Google Cloud Team <[email protected]>  Tue, 22 May 2019 12:00:00 -0700
+
 google-compute-engine (2.8.15-1) stable; urgency=low
 
   * Fix XPS settings with more than 64 vCPUs.

diff --git a/packages/google-compute-engine/packaging/setup_deb.sh b/packages/google-compute-engine/packaging/setup_deb.sh
@@ -14,7 +14,7 @@
 # limitations under the License.
 
 NAME="google-compute-engine"
-VERSION="2.8.15"
+VERSION="2.8.16"
 
 working_dir=${PWD}
 if [[ $(basename "$working_dir") != $NAME ]]; then

diff --git a/packages/google-compute-engine/packaging/setup_rpm.sh b/packages/google-compute-engine/packaging/setup_rpm.sh
@@ -14,7 +14,7 @@
 # limitations under the License.
 
 NAME="google-compute-engine"
-VERSION="2.8.15"
+VERSION="2.8.16"
 
 rpm_working_dir=/tmp/rpmpackage/${NAME}-${VERSION}
 working_dir=${PWD}

diff --git a/packages/python-google-compute-engine/google_compute_engine/instance_setup/instance_setup.py b/packages/python-google-compute-engine/google_compute_engine/instance_setup/instance_setup.py
@@ -169,6 +169,7 @@ def _WriteHostKeyToGuestAttributes(self, key_type, key_value):
     """Write a host key to guest attributes, ignoring errors."""
     headers = {'Metadata-Flavor': 'Google'}
     url = '%s/%s/%s' % (GUEST_ATTRIBUTES_URL, HOSTKEY_NAMESPACE, key_type)
+    key_value = key_value.encode('utf-8')
     req = PutRequest(url, key_value, headers)
     try:
       response = urlrequest.urlopen(req)

diff --git a/...n-google-compute-engine/google_compute_engine/instance_setup/tests/instance_setup_test.py b/...n-google-compute-engine/google_compute_engine/instance_setup/tests/instance_setup_test.py
@@ -335,6 +335,7 @@ def testSetSshHostKeys(self):
   def testWriteHostKeyToGuestAttributes(self, mock_put, mock_urlopen):
     key_type = 'ssh-rsa'
     key_value = 'asdfasdf'
+    encoded_key_value = key_value.encode('utf-8')
     expected_url = ('http://metadata.google.internal/computeMetadata/v1beta1/'
                     'instance/guest-attributes/hostkeys/%s' % key_type)
     headers = {'Metadata-Flavor': 'Google'}
@@ -343,7 +344,7 @@ def testWriteHostKeyToGuestAttributes(self, mock_put, mock_urlopen):
         self.mock_setup, key_type, key_value)
     self.mock_logger.info.assert_called_with(
         'Wrote %s host key to guest attributes.', key_type)
-    mock_put.assert_called_with(expected_url, key_value, headers)
+    mock_put.assert_called_with(expected_url, encoded_key_value, headers)
 
     mock_urlopen.side_effect = instance_setup.urlerror.HTTPError(
         'http://foo', 403, 'Forbidden', {}, None)

diff --git a/packages/python-google-compute-engine/packaging/debian/changelog b/packages/python-google-compute-engine/packaging/debian/changelog
@@ -1,3 +1,9 @@
+python-google-compute-engine (2.8.16-1) stable; urgency=low
+
+  * Fix guest attributes flow in Python 3.
+
+ -- Google Cloud Team <[email protected]>  Tue, 22 May 2019 12:00:00 -0700
+
 python-google-compute-engine (2.8.15-1) stable; urgency=low
 
   * Retry download for metadata scripts.

diff --git a/packages/python-google-compute-engine/packaging/setup_deb.sh b/packages/python-google-compute-engine/packaging/setup_deb.sh
@@ -14,7 +14,7 @@
 # limitations under the License.
 
 NAME="python-google-compute-engine"
-VERSION="2.8.15"
+VERSION="2.8.16"
 
 working_dir=${PWD}
 if [[ $(basename "$working_dir") != $NAME ]]; then

diff --git a/packages/python-google-compute-engine/packaging/setup_rpm.sh b/packages/python-google-compute-engine/packaging/setup_rpm.sh
@@ -14,7 +14,7 @@
 # limitations under the License.
 
 NAME="python-google-compute-engine"
-VERSION="2.8.15"
+VERSION="2.8.16"
 
 rpm_working_dir=/tmp/rpmpackage/${NAME}-${VERSION}
 working_dir=${PWD}

diff --git a/packages/python-google-compute-engine/setup.py b/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='2.8.15',
+    version='2.8.16',
     # Entry points create scripts in /usr/bin that call a function.
     entry_points={
         'console_scripts': [