Convert name from self link to name

Signed-off-by: jnahelou <[email protected]>

libraries/gcp_backend.rb

@@ -44,6 +44,10 @@ def create_resource_methods(object)
     dm = GcpResourceDynamicMethods.new
     dm.create_methods(self, object)
   end
+
+  def name_from_self_link(property)
+    property.split('/').last if !property.nil?
+  end
 end
 # end
 

libraries/google/pubsub/property/subscription_push_config.rb

@@ -24,7 +24,6 @@ def initialize(args = nil)
           @push_endpoint = args['pushEndpoint']
         end
       end
-
     end
   end
 end

libraries/google_pubsub_subscription.rb

@@ -41,12 +41,17 @@ def initialize(params)
   end
 
   def parse
-    @name = @fetched['name']
+    @name = name_from_self_link(@fetched['name'])
     @topic = @fetched['topic']
     @push_config = GoogleInSpec::Pubsub::Property::SubscriptionPushconfig.new(@fetched['pushConfig'])
     @ack_deadline_seconds = @fetched['ackDeadlineSeconds']
   end
 
+  # Handles parsing RFC3339 time string
+  def parse_time_string(time_string)
+    time_string ? Time.parse(time_string) : nil
+  end
+
   def exists?
     !@fetched.nil?
   end

libraries/google_pubsub_subscriptions.rb

@@ -56,6 +56,7 @@ def fetch_wrapped_resource(wrap_path)
       response[wrap_path].each do |hash|
         hash_with_symbols = {}
         hash.each_pair { |k, v| hash_with_symbols[k.to_sym] = v }
+        hash_with_symbols[:name] = name_from_self_link(hash_with_symbols[:name])
         converted.push(hash_with_symbols)
       end
     end

libraries/google_pubsub_topic.rb

@@ -37,7 +37,12 @@ def initialize(params)
   end
 
   def parse
-    @name = @fetched['name']
+    @name = name_from_self_link(@fetched['name'])
+  end
+
+  # Handles parsing RFC3339 time string
+  def parse_time_string(time_string)
+    time_string ? Time.parse(time_string) : nil
   end
 
   def exists?

libraries/google_pubsub_topics.rb

@@ -53,6 +53,7 @@ def fetch_wrapped_resource(wrap_path)
       response[wrap_path].each do |hash|
         hash_with_symbols = {}
         hash.each_pair { |k, v| hash_with_symbols[k.to_sym] = v }
+        hash_with_symbols[:name] = name_from_self_link(hash_with_symbols[:name])
         converted.push(hash_with_symbols)
       end
     end