feat(Config-v2): Support for optlyconfig-v2 added. (#322)

## Summary
- Support for OptimizelyConfig v2 added.

## Issues
- All Config-v2 tests should pass.

Author: yasirfolio3

api/openapi-spec/openapi.yaml

@@ -300,33 +300,67 @@ components:
           type: string
         error_description:
           type: string
-    Experiment:
+    OptimizelyExperiment:
       properties:
         id:
           type: string
         key:
           type: string
+        audiences:
+          type: string
         variationsMap:
           type: object
           additionalProperties:
-            $ref: '#/components/schemas/Variation'
+            $ref: '#/components/schemas/OptimizelyVariation'
       required:
         - id
         - key
-    Feature:
+    OptimizelyAttribute:
+      properties:
+        id:
+          type: string
+        key:
+          type: string
+    OptimizelyAudience:
+      properties:
+        id:
+          type: string
+        name:
+          type: string
+        conditions:
+          type: string
+    OptimizelyEvent:
+      properties:
+        id:
+          type: string
+        key:
+          type: string
+        experimentIds:
+          type: array
+          items:
+            type: string
+    OptimizelyFeature:
       properties:
         id:
           type: string
         key:
           type: string
+        experimentRules:
+          type: array
+          items:
+            $ref: '#/components/schemas/OptimizelyExperiment'
+        deliveryRules:
+          type: array
+          items:
+            $ref: '#/components/schemas/OptimizelyExperiment'
         variablesMap:
           type: object
           additionalProperties:
-            type: object
+            $ref: '#/components/schemas/OptimizelyVariable'
         experimentsMap:
           type: object
           additionalProperties:
-            $ref: '#/components/schemas/Experiment'
+            $ref: '#/components/schemas/OptimizelyExperiment'
       required:
         - id
         - key
@@ -413,16 +447,32 @@ components:
             type: string
     OptimizelyConfig:
       properties:
+        environmentKey:
+          type: string
+        sdkKey:
+          type: string
         revision:
           type: string
         experimentsMap:
           type: object
           additionalProperties:
-            $ref: '#/components/schemas/Experiment'
+            $ref: '#/components/schemas/OptimizelyExperiment'
         featuresMap:
           type: object
           additionalProperties:
-            $ref: '#/components/schemas/Feature'
+            $ref: '#/components/schemas/OptimizelyFeature'
+        attributes:
+          type: array
+          items:
+            $ref: '#/components/schemas/OptimizelyAttribute'
+        audiences:
+          type: array
+          items:
+            $ref: '#/components/schemas/OptimizelyAudience'
+        events:
+          type: array
+          items:
+            $ref: '#/components/schemas/OptimizelyEvent'
     TrackContext:
       properties:
         eventTags:
@@ -452,16 +502,22 @@ components:
           additionalProperties: true
       required:
         - userId
-    Variation:
+    OptimizelyVariation:
       properties:
         id:
           type: string
         key:
           type: string
+        featureEnabled:
+          type: boolean
+        variablesMap:
+          type: object
+          additionalProperties:
+            $ref: '#/components/schemas/OptimizelyVariable'
       required:
         - id
         - key
-    Variable:
+    OptimizelyVariable:
       properties:
         id:
           type: string
@@ -470,7 +526,7 @@ components:
         type:
           type: string
         value:
-          type: object
+          type: string
       required:
         - id
         - key

go.mod

@@ -12,7 +12,7 @@ require (
 	github.com/go-kit/kit v0.9.0
 	github.com/google/uuid v1.1.1
 	github.com/lestrrat-go/jwx v0.9.0
-	github.com/optimizely/go-sdk v1.6.2-0.20210507191537-aba050a09690
+	github.com/optimizely/go-sdk v1.7.0
 	github.com/orcaman/concurrent-map v0.0.0-20190826125027-8c72a8bb44f6
 	github.com/rakyll/statik v0.1.7
 	github.com/rs/zerolog v1.18.1-0.20200514152719-663cbb4c8469

go.sum

@@ -86,8 +86,8 @@ github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742 h1:Esafd1046DLD
 github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0=
 github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U=
 github.com/oklog/ulid v1.3.1/go.mod h1:CirwcVhetQ6Lv90oh/F+FBtV6XMibvdAFo93nm5qn4U=
-github.com/optimizely/go-sdk v1.6.2-0.20210507191537-aba050a09690 h1:lPr7wfM+gdPEKJiOpKdjnEOrxvou1WJdMXxqCrUObis=
-github.com/optimizely/go-sdk v1.6.2-0.20210507191537-aba050a09690/go.mod h1:1uinGREH+AdijSRw3qitWkvIna1e/ZGN5eymNYPjw1A=
+github.com/optimizely/go-sdk v1.7.0 h1:IMSUSH3NdTJjkiTO6f9s+pePaqc8pN+UuX1XqP5aiwY=
+github.com/optimizely/go-sdk v1.7.0/go.mod h1:1uinGREH+AdijSRw3qitWkvIna1e/ZGN5eymNYPjw1A=
 github.com/orcaman/concurrent-map v0.0.0-20190826125027-8c72a8bb44f6 h1:lNCW6THrCKBiJBpz8kbVGjC7MgdCGKwuvBgc7LoD6sw=
 github.com/orcaman/concurrent-map v0.0.0-20190826125027-8c72a8bb44f6/go.mod h1:Lu3tH6HLW3feq74c2GC+jIMS/K2CFcDWnWD9XkenwhI=
 github.com/pelletier/go-toml v1.2.0 h1:T5zMGML61Wp+FlcbWjRDT7yAxhJNAiPPLOFECq181zc=

pkg/optimizely/optimizelytest/config.go

@@ -45,6 +45,8 @@ type TestProjectConfig struct {
 	AnonymizeIP          bool
 	BotFiltering         bool
 	sendFlagDecisions    bool
+	sdkKey               string
+	environmentKey       string
 }
 
 // GetDatafile returns a string representation of the environment's datafile
@@ -72,6 +74,14 @@ func (c *TestProjectConfig) GetAnonymizeIP() bool {
 	return c.AnonymizeIP
 }
 
+// GetAttributes returns attributes
+func (c *TestProjectConfig) GetAttributes() (attributeList []entities.Attribute) {
+	for _, attribute := range c.AttributeMap {
+		attributeList = append(attributeList, attribute)
+	}
+	return attributeList
+}
+
 // GetAttributeID returns attributeID
 func (c *TestProjectConfig) GetAttributeID(key string) string {
 	return c.AttributeKeyToIDMap[key]
@@ -82,6 +92,24 @@ func (c *TestProjectConfig) GetBotFiltering() bool {
 	return c.BotFiltering
 }
 
+// GetSdkKey returns sdkKey for specific environment.
+func (c *TestProjectConfig) GetSdkKey() string {
+	return c.sdkKey
+}
+
+// GetEnvironmentKey returns current environment of the datafile.
+func (c *TestProjectConfig) GetEnvironmentKey() string {
+	return c.environmentKey
+}
+
+// GetEvents returns all events
+func (c *TestProjectConfig) GetEvents() (eventList []entities.Event) {
+	for _, event := range c.EventMap {
+		eventList = append(eventList, event)
+	}
+	return eventList
+}
+
 // GetEventByKey returns the event with the given key
 func (c *TestProjectConfig) GetEventByKey(eventKey string) (entities.Event, error) {
 	if event, ok := c.EventMap[eventKey]; ok {
@@ -141,6 +169,22 @@ func (c *TestProjectConfig) GetExperimentList() (experimentList []entities.Exper
 	return experimentList
 }
 
+// GetRolloutList returns an array of all the rollouts
+func (c *TestProjectConfig) GetRolloutList() (rolloutList []entities.Rollout) {
+	for _, rollout := range c.RolloutMap {
+		rolloutList = append(rolloutList, rollout)
+	}
+	return rolloutList
+}
+
+// GetAudienceList returns an array of all the audiences
+func (c *TestProjectConfig) GetAudienceList() (audienceList []entities.Audience) {
+	for _, audience := range c.AudienceMap {
+		audienceList = append(audienceList, audience)
+	}
+	return audienceList
+}
+
 // GetAudienceByID returns the audience with the given ID
 func (c *TestProjectConfig) GetAudienceByID(audienceID string) (entities.Audience, error) {
 	if audience, ok := c.AudienceMap[audienceID]; ok {

tests/acceptance/test_acceptance/test_batch.py

@@ -47,36 +47,78 @@ def test_batch_valid_reponse(session_obj):
 
 
 expected_body_of_operationid_2 = """{
-    "experimentsMap": {
-        "ab_exper": {
-            "id": "17273802375",
-            "key": "ab_exper",
-            "variationsMap": {
-                "my_single_variation": {
-                    "featureEnabled": false,
-                    "id": "17266384371",
-                    "key": "my_single_variation",
-                    "variablesMap": {}
-                }
-            }
-        }
-    },
-    "featuresMap": {
-        "feature1": {
-            "experimentsMap": {},
-            "id": "15444990338",
-            "key": "feature1",
-            "variablesMap": {
-                "fff": {
-                    "id": "15427520260",
-                    "key": "fff",
-                    "type": "string",
-                    "value": "ss"
-                }
-            }
-        }
-    },
-    "revision": "18"
+	"attributes": [{
+		"id": "12459620467",
+		"key": "bob_ross"
+	}],
+	"audiences": [
+	],
+	"environmentKey": "",
+	"events": [{
+			"experimentIds": [
+			],
+			"id": "15410720745",
+			"key": "clickyclick"
+		}
+	],
+	"experimentsMap": {
+		"ab_exper": {
+			"audiences": "",
+			"id": "17273802375",
+			"key": "ab_exper",
+			"variationsMap": {
+				"my_single_variation": {
+					"featureEnabled": false,
+					"id": "17266384371",
+					"key": "my_single_variation",
+					"variablesMap": {
+					}
+				}
+			}
+		}
+	},
+	"featuresMap": {
+		"feature1": {
+			"deliveryRules": [{
+					"audiences": "",
+					"id": "15439080355",
+					"key": "15439080355",
+					"variationsMap": {
+						"15404730339": {
+							"featureEnabled": true,
+							"id": "15404730339",
+							"key": "15404730339",
+							"variablesMap": {
+								"fff": {
+									"id": "15427520260",
+									"key": "fff",
+									"type": "string",
+									"value": "ss"
+
+								}
+							}
+						}
+					}
+				}
+			],
+			"experimentRules": [
+			],
+			"experimentsMap": {
+			},
+			"id": "15444990338",
+			"key": "feature1",
+			"variablesMap": {
+				"fff": {
+					"id": "15427520260",
+					"key": "fff",
+					"type": "string",
+					"value": "ss"
+				}
+			}
+		}
+	},
+	"revision": "18",
+	"sdkKey": ""
 }"""