Merge ~daniel-thewatkins/cloud-init/+git/cloud-init:bugfix/gce-ssh-key-attributes into cloud-init:master

[Dan Watkins]

Update the attribute used to find instance SSH keys in GCE

Per the documentation at
https://cloud.google.com/compute/docs/storing-retrieving-metadata

The project-level SSH key attribute has not changed in GCE, so is intentionally not changed in this change.

LP: #1693582

[Server Team CI bot (server-team-bot)]

PASSED: Continuous integration, rev:3f615ab91bf5c569354bc0a896901843f722c91f
https://jenkins.ubuntu.com/server/job/cloud-init-ci/403/
Executed test runs:
    SUCCESS: https://jenkins.ubuntu.com/server/job/cloud-init-ci/nodes=metal-amd64/403
    SUCCESS: https://jenkins.ubuntu.com/server/job/cloud-init-ci/nodes=metal-arm64/403
    SUCCESS: https://jenkins.ubuntu.com/server/job/cloud-init-ci/nodes=metal-ppc64el/403
    SUCCESS: https://jenkins.ubuntu.com/server/job/cloud-init-ci/nodes=metal-s390x/403
    SUCCESS: https://jenkins.ubuntu.com/server/job/cloud-init-ci/nodes=vm-i386/403

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/server/job/cloud-init-ci/403/rebuild

review: Approve (continuous-integration)

[Scott Moser (smoser)]

it seems odd that they would change :
  instance/attributes/sshKeys
to
  instance/attributes/ssh-keys
while leaving the camelCase entry in project:
  project/attributes/sshKeys

Has this always been broken? Please explain that, and fix your commit message to suit.

Is 'ssh-keys' also present in project/attributes now?

It just seems odd that they'd change the name in instance/ but not in project/, but that is what your bug implies.

review: Needs Fixing

[Scott Moser (smoser)]

review: Approve

diff --git a/cloudinit/sources/DataSourceGCE.py b/cloudinit/sources/DataSourceGCE.py
index e9afda9..684eac8 100644
--- a/cloudinit/sources/DataSourceGCE.py
+++ b/cloudinit/sources/DataSourceGCE.py
@@ -71,7 +71,7 @@ class DataSourceGCE(sources.DataSource):
             ('availability-zone', ('instance/zone',), True, True),
             ('local-hostname', ('instance/hostname',), True, True),
             ('public-keys', ('project/attributes/sshKeys',
-                             'instance/attributes/sshKeys'), False, True),
+                             'instance/attributes/ssh-keys'), False, True),
             ('user-data', ('instance/attributes/user-data',), False, False),
             ('user-data-encoding', ('instance/attributes/user-data-encoding',),
              False, True),
diff --git a/tests/unittests/test_datasource/test_gce.py b/tests/unittests/test_datasource/test_gce.py
index 3eaa58e..6fd1341 100644
--- a/tests/unittests/test_datasource/test_gce.py
+++ b/tests/unittests/test_datasource/test_gce.py
@@ -140,7 +140,7 @@ class TestDataSourceGCE(test_helpers.HttprettyTestCase):
     def test_instance_level_ssh_keys_are_used(self):
         key_content = 'ssh-rsa JustAUser root@server'
         meta = GCE_META.copy()
-        meta['instance/attributes/sshKeys'] = 'user:{0}'.format(key_content)
+        meta['instance/attributes/ssh-keys'] = 'user:{0}'.format(key_content)
 
         _set_mock_metadata(meta)
         self.ds.get_data()
@@ -150,7 +150,7 @@ class TestDataSourceGCE(test_helpers.HttprettyTestCase):
     def test_instance_level_keys_replace_project_level_keys(self):
         key_content = 'ssh-rsa JustAUser root@server'
         meta = GCE_META.copy()
-        meta['instance/attributes/sshKeys'] = 'user:{0}'.format(key_content)
+        meta['instance/attributes/ssh-keys'] = 'user:{0}'.format(key_content)
 
         _set_mock_metadata(meta)
         self.ds.get_data()