Feat: added SDKkey and environmentKey in datafile (#281)

* init

* unit test fixes

* duplicate revision removed

* comments addressed

* get_experiment_from_key  reinserted

* spec updated

* robo cop issues resolved

* tests for test getters removed

* null sdk and environment values removed from config

* extra spacing removed

Author: ozayr-zaviar

lib/optimizely/config/datafile_project_config.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-#    Copyright 2019-2020, Optimizely and contributors
+#    Copyright 2019-2021, Optimizely and contributors
 #
 #    Licensed under the Apache License, Version 2.0 (the "License");
 #    you may not use this file except in compliance with the License.
@@ -38,6 +38,8 @@ class DatafileProjectConfig < ProjectConfig
     attr_reader :anonymize_ip
     attr_reader :bot_filtering
     attr_reader :revision
+    attr_reader :sdk_key
+    attr_reader :environment_key
     attr_reader :rollouts
     attr_reader :version
     attr_reader :send_flag_decisions
@@ -83,6 +85,8 @@ def initialize(datafile, logger, error_handler)
       @anonymize_ip = config.key?('anonymizeIP') ? config['anonymizeIP'] : false
       @bot_filtering = config['botFiltering']
       @revision = config['revision']
+      @sdk_key = config.fetch('sdkKey', nil)
+      @environment_key = config.fetch('environmentKey', nil)
       @rollouts = config.fetch('rollouts', [])
       @send_flag_decisions = config.fetch('sendFlagDecisions', false)
 

lib/optimizely/optimizely_config.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-#    Copyright 2019-2020, Optimizely and contributors
+#    Copyright 2019-2021, Optimizely and contributors
 #
 #    Licensed under the Apache License, Version 2.0 (the "License");
 #    you may not use this file except in compliance with the License.
@@ -24,12 +24,15 @@ def initialize(project_config)
     def config
       experiments_map_object = experiments_map
       features_map = get_features_map(experiments_map_object)
-      {
+      config = {
         'datafile' => @project_config.datafile,
         'experimentsMap' => experiments_map_object,
         'featuresMap' => features_map,
         'revision' => @project_config.revision
       }
+      config['sdkKey'] = @project_config.sdk_key if @project_config.sdk_key
+      config['environmentKey'] = @project_config.environment_key if @project_config.environment_key
+      config
     end
 
     private

lib/optimizely/project_config.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-#    Copyright 2016-2020, Optimizely and contributors
+#    Copyright 2016-2021, Optimizely and contributors
 #
 #    Licensed under the Apache License, Version 2.0 (the "License");
 #    you may not use this file except in compliance with the License.
@@ -46,6 +46,10 @@ def bot_filtering; end
 
     def revision; end
 
+    def sdk_key; end
+
+    def environment_key; end
+
     def send_flag_decisions; end
 
     def rollouts; end

spec/config/datafile_project_config_spec.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 #
-#    Copyright 2019-2020, Optimizely and contributors
+#    Copyright 2019-2021, Optimizely and contributors
 #
 #    Licensed under the Apache License, Version 2.0 (the "License");
 #    you may not use this file except in compliance with the License.
@@ -51,6 +51,8 @@
       expect(project_config.groups).to eq(config_body['groups'])
       expect(project_config.project_id).to eq(config_body['projectId'])
       expect(project_config.revision).to eq(config_body['revision'])
+      expect(project_config.sdk_key).to eq(config_body['sdkKey'])
+      expect(project_config.environment_key).to eq(config_body['environmentKey'])
       expect(project_config.send_flag_decisions).to eq(config_body['sendFlagDecisions'])
 
       expected_attribute_key_map = {

spec/optimizely_config_spec.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 #
-#    Copyright 2019-2020, Optimizely and contributors
+#    Copyright 2019-2021, Optimizely and contributors
 #
 #    Licensed under the Apache License, Version 2.0 (the "License");
 #    you may not use this file except in compliance with the License.
@@ -95,6 +95,14 @@
     expect(project_config.revision).to eq(optimizely_config['revision'])
   end
 
+  it 'should return correct sdk key' do
+    expect(project_config.sdk_key).to eq(optimizely_config['sdkKey'])
+  end
+
+  it 'should return correct environment key' do
+    expect(project_config.environment_key).to eq(optimizely_config['environmentKey'])
+  end
+
   it 'should return correct datafile string' do
     expect(project_config.datafile).to eq(optimizely_config['datafile'])
   end

spec/spec_params.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 #
-#    Copyright 2016-2020, Optimizely and contributors
+#    Copyright 2016-2021, Optimizely and contributors
 #
 #    Licensed under the Apache License, Version 2.0 (the "License");
 #    you may not use this file except in compliance with the License.
@@ -24,6 +24,8 @@ module OptimizelySpec
     'anonymizeIP' => false,
     'botFiltering' => true,
     'revision' => '42',
+    'sdkKey' => 'VALID',
+    'environmentKey' => 'VALID_ENVIRONMENT',
     'version' => '2',
     'sendFlagDecisions' => true,
     'events' => [{
@@ -1125,6 +1127,8 @@ module OptimizelySpec
       }
     ],
     'revision' => '3',
+    'sdkKey' => 'AUDIENCES',
+    'environmentKey' => 'AUDIENCES_ENVIRONMENT',
     'sendFlagDecisions' => true
   }.freeze