apollo_commons_ruby_cli 1.0.0 → 1.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c2a6d9a71e323ba743ad61c04ae7ea849dba6e7a54d0c0691b2c1f674397384c
-  data.tar.gz: 5e976f8165b92a853c44178f24d57be92d29bd4be227b0dc0caf6ae772612f35
+  metadata.gz: a93befb033c2010ef88b1b46e79180dd9bf1642a78a12630c63232a2b37a4934
+  data.tar.gz: 18800ff299742001152de494b9f9f37eaa29448f3739b92183d8cf5bebf08e1b
 SHA512:
-  metadata.gz: 1a6aea498ecf5963b7ab57c76314847df0509861231de77b3a38b7d5fd828df0d2533c4067c992f82e8fae0294080df43e0a4877308a4d83d86e524fca0dc3fa
-  data.tar.gz: 39cf3baf730d63369ec7eb48b5723d511dcc55a335334f4d8f0586e745f21c8f7472fb5470a617ccb3c5d878deec00b94086ebc6cfb2a21096b997ccc194ef47
+  metadata.gz: 2edd9a3a90858253829df08b7108d1eb9275e0555019013a3978db045d2db4557fdb59298288cfe24bbae701f331b5c806f3cfc90661169294a0ad3cd7ae0414
+  data.tar.gz: 7c00dc1992761d76957506aa07ae2194c76b0959038bc3e7487507486c4c12c8d5b7137c7706348f5f24a047ed85cfbb88197014a567fadd4370f788af582b3e

data/README.md

@@ -9,7 +9,7 @@ TODO: Delete this and the text above, and describe your gem
 Add this line to your application's Gemfile:
 
 ```ruby
-gem 'apollo_commons_ruby'
+gem 'apollo_commons_ruby_cli'
 ```
 
 And then execute:
@@ -18,23 +18,22 @@ And then execute:
 
 Or install it yourself as:
 
-    $ gem install apollo_commons_ruby
+    $ gem install apollo_commons_ruby_cli
 
-## Usage
+## Release  
 
-TODO: Write usage instructions here
-
-## Development
-
-After checking out the repo, run `bin/setup` to install dependencies. You can also run `bin/console` for an interactive prompt that will allow you to experiment.
-
-To install this gem onto your local machine, run `bundle exec rake install`. To release a new version, update the version number in `version.rb`, and then run `bundle exec rake release`, which will create a git tag for the version, push git commits and tags, and push the `.gem` file to [rubygems.org](https://rubygems.org).
-
-## Contributing
-
-Bug reports and pull requests are welcome on GitHub at https://github.com/[USERNAME]/apollo_commons_ruby. This project is intended to be a safe, welcoming space for collaboration, and contributors are expected to adhere to the [code of conduct](https://github.com/[USERNAME]/apollo_commons_ruby/blob/master/CODE_OF_CONDUCT.md).
+1. Increament gem version here https://bitbucket.org/zetaengg/apollo_commons_ruby/src/master/lib/version.rb  
 
+2. Build gem  
+```ruby
+gem build apollo_commons_ruby.gemspec
+```
 
-## Code of Conduct
+3. Gem will be created in root folder of repo with version in file name. Publish this gem.
+```ruby
+gem push apollo_commons_ruby_cli-1.0.0.gem
+```
 
-Everyone interacting in the ApolloCommonsRuby project's codebases, issue trackers, chat rooms and mailing lists is expected to follow the [code of conduct](https://github.com/[USERNAME]/apollo_commons_ruby/blob/master/CODE_OF_CONDUCT.md).
+4. Use these credentials.  
+email - bibhorc@zeta.tech  
+password - Zeta@12345  

data/lib/apollo_commons_ruby/NetworkUtils.rb

@@ -4,6 +4,7 @@ require 'uri'
 require 'openssl'
 require 'base64'
 
+$tenant_token = nil
 def make_PUT_request (url, body, authtoken, query_params = nil, should_log = true)
   if authtoken == nil
     authtoken = ""
@@ -110,28 +111,20 @@ def get_token_and_make_request(type, environment, tenantId, projectId, url, body
     else
       authToken = conf["heraAuthToken"]
     end
-  
+
   else
     raise_exception_if_string_empty(environment, "environment")
     raise_exception_if_string_empty(tenantId, "tenantId")
     raise_exception_if_string_empty(projectId, "projectId")
 
-    tenantTokenCacheKey = "tenantToken_#{environment}_#{tenantId}"
-    if(ENV[tenantTokenCacheKey] == nil)
-      puts "Making api call to get tenant token"
-      load_environment_properties(environment, tenantId, projectId)
-      raise_exception_if_string_empty($environmentProperties["apolloAppBaseUrl"], "apolloAppBaseUrl")
+    load_environment_properties(environment, tenantId, projectId)
+    raise_exception_if_string_empty($environmentProperties["apolloAppBaseUrl"], "apolloAppBaseUrl")
 
-      authToken = get_token(tenantId, use_tenant_token)
-      ENV[tenantTokenCacheKey] = authToken
-    else
-      puts "Using cached tenant token"
-      authToken = ENV[tenantTokenCacheKey]
-    end
+    authToken = get_token(tenantId, use_tenant_token)
   end
 
   if (authToken == nil)
-    raise "Failed to get authToken"
+    raise "Failed to get authToken from apollo-app"
     return
   end
 
@@ -156,20 +149,24 @@ def get_token(tenantId, use_tenant_token)
 end
 
 def get_tenant_token(apolloAppBaseUrl, tenantId, heraAuthToken)
+  if $tenant_token != nil
+    puts "Using cached token"
+    return $tenant_token
+  end
   puts "getting tenant auth token from apollo app"
 
   apolloAppUrl = apolloAppBaseUrl + "/apollo-app/1.0/tenants/#{tenantId}/access-token"
   code, response = make_GET_request(apolloAppUrl, heraAuthToken, nil, false)
 
   jsonResponse = JSON.parse(response)
-  tenantAuthToken = jsonResponse["access_token"]
+  $tenant_token = jsonResponse["access_token"]
 
-  if (tenantAuthToken == nil)
+  if ($tenant_token == nil)
     raise "Failed to get tenantAuthToken from apollo-app"
     return nil
   end
 
-  return tenantAuthToken
+  return $tenant_token
 end
 
 def invoke_API(environment, url, type, query_params = nil, body = nil, authToken = nil)

data/lib/apollo_commons_ruby/TemplatesHelper.rb

@@ -422,6 +422,10 @@ class Configuration
     "#{@base_folder_path}/#{template_group}/transformer.js"
   end
 
+    def sample_data_file_path_for_template(template_group)
+      "#{@base_folder_path}/#{template_group}/sampleData.json"
+    end
+
   def client_transfomer_file_path_for_template(template_group)
     "#{@base_folder_path}/#{template_group}/clientTransformer.js"
   end

data/lib/apollo_commons_ruby/TemplatesRakefile.rb

@@ -217,6 +217,15 @@ def get_parsed_template_group_details(configuration,template_group)
   return JSON.parse(template_group_details)
 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 == {}
+    return nil
+  end
+  return JSON.parse(sample_data_details)
+end
+
 def verify_and_get_template_version(version)
   allowed_versions = {"v2" => "iOS_v2", "v3" => "iOS_v3"}
   if version == nil
@@ -821,6 +830,16 @@ def upsert_template_group_apollo_config(is_mario_template, environment, configur
     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
+  }
+
   field_ordering = template_group_details["fieldOrdering"]
   expected_data = template_group_details["expectedData"]
 
@@ -828,7 +847,8 @@ def upsert_template_group_apollo_config(is_mario_template, environment, configur
     :expectedData => expected_data,
     :fieldOrdering => field_ordering,
     :transformer => transformer_data,
-    :version => version
+    :version => version,
+    :attrs => attrs.to_s
   }
 
   puts "\n*[Apollo-config]: Upsert template group API call*\n"

data/lib/apollo_commons_ruby.rb

@@ -6,6 +6,7 @@ module MarioConfig
        load 'tasks/delete_domain_event.rake'
        load 'tasks/delete_view_group_component.rake'
        load 'tasks/delete_view_group_definition.rake'
+       load 'tasks/delete_all_view_group_definition.rake'
        load 'tasks/delete_view_group.rake'
        load 'tasks/update_all_domain_events.rake'
        load 'tasks/update_all_view_group_components.rake'

data/lib/tasks/delete_all_view_group_definition.rake

@@ -0,0 +1,28 @@
+require_relative '../apollo_commons_ruby/ViewGroupDefinition'
+require_relative '../apollo_commons_ruby/ViewGroupComponent'
+require_relative '../apollo_commons_ruby/DomainEvent'
+require_relative '../apollo_commons_ruby/Operation'
+
+desc "Delete All View Group Definition"
+task :delete_all_view_group_definition do
+    environment = ENV["environment"]
+    tenantId = ENV["tenant_id"]
+    projectId = ENV["project_id"]
+
+    Dir.foreach('./configs/') do |viewGroupDefinition|
+        next if viewGroupDefinition == '.' || viewGroupDefinition == '..'
+        Dir.foreach('./configs/' + viewGroupDefinition) do |viewGroupComponent|
+            next if viewGroupComponent == '.' || viewGroupComponent == '..' || viewGroupComponent == 'view_group_definition_properties.json' || viewGroupComponent == '.DS_Store'
+            Dir.foreach('./configs/' + viewGroupDefinition + "/" + viewGroupComponent) do |topic|
+                next if topic == '.' || topic == '..' || topic == 'view_group_component_properties.json' || topic == '.DS_Store'
+                Dir.foreach('./configs/' + viewGroupDefinition + "/" + viewGroupComponent + "/" + topic) do |eventName|
+                    next if eventName == '.' || eventName == '..' || eventName == '.DS_Store'
+                    puts "Deleting domain event for topic " + topic + " and eventName = " + eventName + " and component = " + viewGroupComponent
+                    handle_domain_event(viewGroupDefinition, environment, tenantId, projectId, viewGroupComponent, topic, eventName, Operation::DELETE)
+                end
+                handle_view_group_component(viewGroupDefinition, environment, tenantId, projectId, viewGroupComponent, Operation::DELETE)
+            end
+            handle_view_group_definition(viewGroupDefinition, environment, tenantId, projectId, Operation::DELETE)
+        end
+    end
+end

data/lib/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: apollo_commons_ruby_cli
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.3
 platform: ruby
 authors:
 - Sahil Prakash
-autorequire:
+autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-07-06 00:00:00.000000000 Z
+date: 2022-09-16 00:00:00.000000000 Z
 dependencies: []
 description: Used in ruby functions
 email:
@@ -58,6 +58,7 @@ files:
 - lib/tasks/add_translations.rake
 - lib/tasks/backfill_sample_data.rake
 - lib/tasks/checkValidJson.rake
+- lib/tasks/delete_all_view_group_definition.rake
 - lib/tasks/delete_domain_event.rake
 - lib/tasks/delete_view_group.rake
 - lib/tasks/delete_view_group_component.rake
@@ -87,7 +88,7 @@ metadata:
   homepage_uri: https://bitbucket.org/zetaengg/apollo_commons_ruby/src
   source_code_uri: https://bitbucket.org/zetaengg/apollo_commons_ruby/src
   changelog_uri: https://bitbucket.org/zetaengg/apollo_commons_ruby/src
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -102,8 +103,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.6
-signing_key:
+rubygems_version: 3.0.3
+signing_key: 
 specification_version: 4
 summary: Ruby utilities for apollo projects
 test_files: []