Merge pull request #156 from sid88in/revert-155-master

Revert "Add support for Multiple APIs"
sid88in · Sep 20, 2018 · d4e23bc · d4e23bc
2 parents 20fe90a + 305b5e8
commit d4e23bc
Show file tree

Hide file tree

Showing 4 changed files with 102 additions and 156 deletions.
diff --git a/__snapshots__/get-config.test.js.snap b/__snapshots__/get-config.test.js.snap
@@ -5,29 +5,27 @@ exports[`authenticationType is missing 1`] = `"appSync property \`authentication
 exports[`authenticationType is missing 2`] = `"appSync property \`authenticationType\` is missing or invalid."`;
 
 exports[`returns valid config 1`] = `
-Array [
-  Object {
-    "apiId": undefined,
-    "apiKey": undefined,
-    "authenticationType": "AWS_IAM",
-    "dataSources": Array [
-      Object {
-        "name": "users",
-        "type": "AMAZON_DYNAMODB",
-      },
-      Object {
-        "name": "tweets",
-        "type": "AMAZON_DYNAMODB",
-      },
-    ],
-    "isSingleConfig": true,
-    "logConfig": undefined,
-    "mappingTemplates": Array [],
-    "mappingTemplatesLocation": "mapping-templates",
-    "name": "api",
-    "openIdConnectConfig": undefined,
-    "region": "us-east-1",
-    "schema": "type Mutation {
+Object {
+  "apiId": undefined,
+  "apiKey": undefined,
+  "authenticationType": "AWS_IAM",
+  "dataSources": Array [
+    Object {
+      "name": "users",
+      "type": "AMAZON_DYNAMODB",
+    },
+    Object {
+      "name": "tweets",
+      "type": "AMAZON_DYNAMODB",
+    },
+  ],
+  "logConfig": undefined,
+  "mappingTemplates": Array [],
+  "mappingTemplatesLocation": "mapping-templates",
+  "name": "api",
+  "openIdConnectConfig": undefined,
+  "region": "us-east-1",
+  "schema": "type Mutation {
 	# Create a tweet for a user
 	# consumer keys and tokens are not required for dynamo integration
 	createTweet(
@@ -121,8 +119,7 @@ schema {
 	subscription: Subscription
 }
 ",
-    "substitutions": Object {},
-    "userPoolConfig": undefined,
-  },
-]
+  "substitutions": Object {},
+  "userPoolConfig": undefined,
+}
 `;
diff --git a/get-config.js b/get-config.js
@@ -9,7 +9,7 @@ const objectToArrayWithNameProp = pipe(
   values,
 );
 
-const getConfig = (config, provider, servicePath) => {
+module.exports = (config, provider, servicePath) => {
   if (
     !(
       config.authenticationType === 'API_KEY' ||
@@ -65,15 +65,3 @@ const getConfig = (config, provider, servicePath) => {
     substitutions: config.substitutions || {},
   };
 };
-
-module.exports = (config, provider, servicePath) => {
-  if (!config) {
-    return [];
-  } else if (config.constructor === Array) {
-    return config.map(apiConfig => getConfig(apiConfig, provider, servicePath));
-  } else {
-    const singleConfig = getConfig(config, provider, servicePath);
-    singleConfig.isSingleConfig = true;
-    return [singleConfig];
-  }
-};