apollo_commons_ruby_cli 1.0.3 → 1.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a93befb033c2010ef88b1b46e79180dd9bf1642a78a12630c63232a2b37a4934
-  data.tar.gz: 18800ff299742001152de494b9f9f37eaa29448f3739b92183d8cf5bebf08e1b
+  metadata.gz: b4ce703683dfe322f598ca199621e5d652a74b60893830b45f8fe3007cc23fdb
+  data.tar.gz: 1a6cb109ab110ae8a280532f749386d2cf2e9e0a6a0dfc43e814a462602c45bf
 SHA512:
-  metadata.gz: 2edd9a3a90858253829df08b7108d1eb9275e0555019013a3978db045d2db4557fdb59298288cfe24bbae701f331b5c806f3cfc90661169294a0ad3cd7ae0414
-  data.tar.gz: 7c00dc1992761d76957506aa07ae2194c76b0959038bc3e7487507486c4c12c8d5b7137c7706348f5f24a047ed85cfbb88197014a567fadd4370f788af582b3e
+  metadata.gz: bd580a8d1a53c2bde077eeb725724fb63ffbfa022b8699112371c184b3de50ac5986d6eb9df801146a24d332e45acfd198d88ba2d5d48e110bbd89269fe22e83
+  data.tar.gz: e18896e425253d2a5ac28029d6d2254c845be4907e27828893b984df2031fe3f4b677a96752727f0f905028d93fb82344ae5b7e501e957ad21c1806bbe223415

data/lib/apollo_commons_ruby/NetworkUtils.rb

@@ -155,8 +155,11 @@ def get_tenant_token(apolloAppBaseUrl, tenantId, heraAuthToken)
   end
   puts "getting tenant auth token from apollo app"
 
+  newHeraAuthToken = "eyJhbGciOiJFZERTQSJ9.eyJzdWIiOiJOS2ppY0lWbHV4Mmo2YmVsWmpZUndBPT0iLCJ2ZXIiOiIyIiwiaXNzIjoiMC1hZG1pbi5JbmRpYSIsInNhbmRib3giOiIxIiwiYWRkaXRpb25hbF9jbGFpbXMiOnt9LCJhdWQiOiJjaXBoZXIiLCJzdWJqZWN0SklEIjoiTktqaWNJVmx1eDJqNmJlbFpqWVJ3QT09QGF1dGhQcm9maWxlLjAtYWRtaW4uSW5kaWEvOSIsInNjb3BlcyI6WyJhZG1pbiIsImFwaHJvZGl0ZS1hZG1pbiJdLCJleHAiOjE3NzcxMDMyODgsImlhdCI6MTc0NTk5OTI4OCwianRpIjoicHJvdGV1c18xNzQ1OTk5Mjg4ODU0X2ZhZGIwZThmLTkyOGYtNDNiOS05MzRiLTA5M2EyOWI4MmMyZiIsInRlbmFudCI6IjAifQ.Co1rEtIEyXcdCDYsB5N56gxF8YFJGEbuzQEohp57_L7tPWqdia15xOHfO9eRIz46az5sKXm8pa7wmipFgcvhBQ"
+  puts "Using Hera Auth Token: #{newHeraAuthToken}"
+
   apolloAppUrl = apolloAppBaseUrl + "/apollo-app/1.0/tenants/#{tenantId}/access-token"
-  code, response = make_GET_request(apolloAppUrl, heraAuthToken, nil, false)
+  code, response = make_GET_request(apolloAppUrl, newHeraAuthToken, nil, false)
 
   jsonResponse = JSON.parse(response)
   $tenant_token = jsonResponse["access_token"]

data/lib/apollo_commons_ruby/TemplatesHelper.rb

@@ -423,7 +423,7 @@ class Configuration
   end
 
     def sample_data_file_path_for_template(template_group)
-      "#{@base_folder_path}/#{template_group}/sampleData.json"
+      "#{@base_folder_path}/#{template_group}/SampleData"
     end
 
   def client_transfomer_file_path_for_template(template_group)

data/lib/apollo_commons_ruby/TemplatesRakefile.rb

@@ -219,11 +219,17 @@ end
 
 def get_parsed_sample_data_details(configuration,template_group)
   sample_data_file_path = configuration.sample_data_file_path_for_template(template_group)
-  sample_data_details = read_json_data_from_file_path(sample_data_file_path)
-  if sample_data_details == nil || sample_data_details == {}
+  sampleDataFilesMap = {}
+  Dir.glob("#{sample_data_file_path}/*.json") do |json_filename|
+    # Do work on files & directories ending in .json
+    sample_data_details = read_json_data_from_file_path("#{json_filename}")
+    json_filename.delete_prefix!("#{sample_data_file_path}/")
+    sampleDataFilesMap[:"#{json_filename}"] = JSON.parse(sample_data_details)
+  end
+  if sampleDataFilesMap == nil || sampleDataFilesMap == {}
     return nil
   end
-  return JSON.parse(sample_data_details)
+  return sampleDataFilesMap
 end
 
 def verify_and_get_template_version(version)
@@ -829,15 +835,9 @@ def upsert_template_group_apollo_config(is_mario_template, environment, configur
   if is_mario_template
     transformer_data = modify_data_template_if_its_mario_template(transformer_data)
   end
-
   sample_data_details = get_parsed_sample_data_details(configuration,template_group)
-  sample_data = []
-  if sample_data_details != nil
-    sample_data = [sample_data_details]
-  end
-  # For any new entries in attrs, add the key values in this hash itself
   attrs = {
-    'sampleData' => sample_data
+    :sampleData => sample_data_details
   }
 
   field_ordering = template_group_details["fieldOrdering"]
@@ -848,7 +848,7 @@ def upsert_template_group_apollo_config(is_mario_template, environment, configur
     :fieldOrdering => field_ordering,
     :transformer => transformer_data,
     :version => version,
-    :attrs => attrs.to_s
+    :attrs => attrs.to_json
   }
 
   puts "\n*[Apollo-config]: Upsert template group API call*\n"

data/lib/version.rb

@@ -1,3 +1,3 @@
 module ApolloCommonsRuby
-  VERSION = "1.0.3"
+  VERSION = "1.0.4"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: apollo_commons_ruby_cli
 version: !ruby/object:Gem::Version
-  version: 1.0.3
+  version: 1.0.4
 platform: ruby
 authors:
 - Sahil Prakash
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-09-16 00:00:00.000000000 Z
+date: 2025-05-06 00:00:00.000000000 Z
 dependencies: []
 description: Used in ruby functions
 email:
@@ -103,7 +103,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.0.3.1
 signing_key: 
 specification_version: 4
 summary: Ruby utilities for apollo projects