(FACT-3136) Split ssh-keys

GCE deprecated "sshKeys" and recommends "ssh-keys", so transform both.

[1] https://cloud.google.com/compute/docs/metadata/default-metadata-values

Author: joshcooper

lib/facter/resolvers/gce.rb

@@ -40,11 +40,13 @@ def parse_instance(gce_data)
           return if instance_data.nil? || instance_data.empty?
 
           # See https://cloud.google.com/compute/docs/metadata for information about these values
-          keys = gce_data.dig('project', 'attributes', 'sshKeys')
-          gce_data['project']['attributes']['sshKeys'] = keys.strip.split("\n") if keys
+          %w[sshKeys ssh-keys].each do |name|
+            keys = gce_data.dig('project', 'attributes', name)
+            gce_data['project']['attributes'][name] = keys.strip.split("\n") if keys
 
-          keys = instance_data.dig('attributes', 'sshKeys')
-          instance_data['attributes']['sshKeys'] = keys.strip.split("\n") if keys
+            keys = instance_data.dig('attributes', name)
+            instance_data['attributes'][name] = keys.strip.split("\n") if keys
+          end
 
           %w[image machineType zone].each do |key|
             instance_data[key] = instance_data[key].split('/').last if instance_data[key]

spec/facter/resolvers/gce_spec.rb

@@ -21,6 +21,10 @@
         'instance' => {
           'attributes' => {
             # resolver transforms key1\nkey2 into array of keys
+            'ssh-keys' => [
+              'john_doe:ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDA9D8Op48TtEiDmb+Gtna3Bs9B google-ssh {"userName":"[email protected]","expireOn":"2020-08-13T12:17:19+0000"}',
+              'jane_doe:ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDA9D8Op48TtEiDmb+Gtna3Bs9B google-ssh {"userName":"[email protected]","expireOn":"2020-08-13T12:17:19+0000"}'
+            ],
             'sshKeys' => [
               'jill_doe:ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDA9D8Op48TtEiDmb+Gtna3Bs9B google-ssh {"userName":"[email protected]","expireOn":"2020-08-13T12:17:19+0000"}',
               'jacob_doe:ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDA9D8Op48TtEiDmb+Gtna3Bs9B google-ssh {"userName":"[email protected]","expireOn":"2020-08-13T12:17:19+0000"}'
@@ -128,8 +132,8 @@
         'project' => {
           'attributes' => {
             # resolver transforms key1\nkey2 into array of keys
-            'ssh-keys' => 'john_doe:ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDA9D8Op48TtEiDmb+Gtna3Bs9B' \
-              " google-ssh {\"userName\":\"john[email protected]\",\"expireOn\":\"2020-08-13T12:17:19+0000\"}\n",
+            'ssh-keys' => ['john_doe:ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDA9D8Op48TtEiDmb+Gtna3Bs9B google-ssh {"userName":"[email protected]","expireOn":"2020-08-13T12:17:19+0000"}',
+                           'jane_doe:ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDA9D8Op48TtEiDmb+Gtna3Bs9B google-ssh {"userName":"jane[email protected]","expireOn":"2020-08-13T12:17:19+0000"}'],
             'sshKeys' => [
               'jill_doe:ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDA9D8Op48TtEiDmb+Gtna3Bs9B google-ssh {"userName":"[email protected]","expireOn":"2020-08-13T12:17:19+0000"}',
               'jacob_doe:ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDA9D8Op48TtEiDmb+Gtna3Bs9B google-ssh {"userName":"[email protected]","expireOn":"2020-08-13T12:17:19+0000"}'

spec/fixtures/gce

@@ -2,6 +2,7 @@
 "instance":
     {
         "attributes":{
+            "ssh-keys":"john_doe:ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDA9D8Op48TtEiDmb+Gtna3Bs9B google-ssh {\"userName\":\"[email protected]\",\"expireOn\":\"2020-08-13T12:17:19+0000\"}\njane_doe:ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDA9D8Op48TtEiDmb+Gtna3Bs9B google-ssh {\"userName\":\"[email protected]\",\"expireOn\":\"2020-08-13T12:17:19+0000\"}\n",
             "sshKeys":"jill_doe:ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDA9D8Op48TtEiDmb+Gtna3Bs9B google-ssh {\"userName\":\"[email protected]\",\"expireOn\":\"2020-08-13T12:17:19+0000\"}\njacob_doe:ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDA9D8Op48TtEiDmb+Gtna3Bs9B google-ssh {\"userName\":\"[email protected]\",\"expireOn\":\"2020-08-13T12:17:19+0000\"}"
         },
         "cpuPlatform":"Intel Broadwell",
@@ -65,7 +66,7 @@
     {
         "attributes":
         {
-            "ssh-keys":"john_doe:ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDA9D8Op48TtEiDmb+Gtna3Bs9B google-ssh {\"userName\":\"[email protected]\",\"expireOn\":\"2020-08-13T12:17:19+0000\"}\n",
+            "ssh-keys":"john_doe:ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDA9D8Op48TtEiDmb+Gtna3Bs9B google-ssh {\"userName\":\"[email protected]\",\"expireOn\":\"2020-08-13T12:17:19+0000\"}\njane_doe:ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDA9D8Op48TtEiDmb+Gtna3Bs9B google-ssh {\"userName\":\"[email protected]\",\"expireOn\":\"2020-08-13T12:17:19+0000\"}\n",
             "sshKeys":"jill_doe:ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDA9D8Op48TtEiDmb+Gtna3Bs9B google-ssh {\"userName\":\"[email protected]\",\"expireOn\":\"2020-08-13T12:17:19+0000\"}\njacob_doe:ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDA9D8Op48TtEiDmb+Gtna3Bs9B google-ssh {\"userName\":\"[email protected]\",\"expireOn\":\"2020-08-13T12:17:19+0000\"}"
         },
         "numericProjectId":728618928092,