From b8e086858bfaeb4dba8765231f74282fa70ceb29 Mon Sep 17 00:00:00 2001
From: Justin Lyons <jlyons@hueyscomputers.com>
Date: Tue, 26 Feb 2019 11:47:40 -0500
Subject: [PATCH 1/5] Adding yaml and json to oas30 and swagger docs

---
 .idea/aws.xml                                |  11 ++
 .idea/codeStyles/Project.xml                 |  26 +++
 .idea/codeStyles/codeStyleConfig.xml         |   5 +
 .idea/encodings.xml                          |   4 +
 .idea/inspectionProfiles/Project_Default.xml |   6 +
 .idea/misc.xml                               |  13 ++
 .idea/modules.xml                            |   8 +
 .idea/serverless-export-swagger.iml          |  12 ++
 .idea/vcs.xml                                |   6 +
 .idea/workspace.xml                          | 158 +++++++++++++++++++
 src/index.js                                 |  66 +++++++-
 11 files changed, 313 insertions(+), 2 deletions(-)
 create mode 100644 .idea/aws.xml
 create mode 100644 .idea/codeStyles/Project.xml
 create mode 100644 .idea/codeStyles/codeStyleConfig.xml
 create mode 100644 .idea/encodings.xml
 create mode 100644 .idea/inspectionProfiles/Project_Default.xml
 create mode 100644 .idea/misc.xml
 create mode 100644 .idea/modules.xml
 create mode 100644 .idea/serverless-export-swagger.iml
 create mode 100644 .idea/vcs.xml
 create mode 100644 .idea/workspace.xml

diff --git a/.idea/aws.xml b/.idea/aws.xml
new file mode 100644
index 0000000..1ea8305
--- /dev/null
+++ b/.idea/aws.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="accountSettings">
+    <option name="activeProfile" value="profile:default" />
+    <option name="recentlyUsedProfiles">
+      <list>
+        <option value="profile:default" />
+      </list>
+    </option>
+  </component>
+</project>
\ No newline at end of file
diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml
new file mode 100644
index 0000000..fa043ab
--- /dev/null
+++ b/.idea/codeStyles/Project.xml
@@ -0,0 +1,26 @@
+<component name="ProjectCodeStyleConfiguration">
+  <code_scheme name="Project" version="173">
+    <option name="ALIGN_MULTILINE_PARAMETERS_IN_CALLS" value="true" />
+    <JSCodeStyleSettings version="0">
+      <option name="USE_SEMICOLON_AFTER_STATEMENT" value="false" />
+      <option name="FORCE_SEMICOLON_STYLE" value="true" />
+      <option name="USE_DOUBLE_QUOTES" value="false" />
+      <option name="FORCE_QUOTE_STYlE" value="true" />
+      <option name="VAR_DECLARATION_WRAP" value="2" />
+      <option name="OBJECT_LITERAL_WRAP" value="2" />
+      <option name="SPACES_WITHIN_OBJECT_LITERAL_BRACES" value="true" />
+      <option name="SPACES_WITHIN_IMPORTS" value="true" />
+    </JSCodeStyleSettings>
+    <codeStyleSettings language="JavaScript">
+      <option name="METHOD_CALL_CHAIN_WRAP" value="2" />
+      <option name="IF_BRACE_FORCE" value="1" />
+      <option name="DOWHILE_BRACE_FORCE" value="1" />
+      <option name="WHILE_BRACE_FORCE" value="1" />
+      <option name="FOR_BRACE_FORCE" value="1" />
+      <indentOptions>
+        <option name="INDENT_SIZE" value="2" />
+        <option name="CONTINUATION_INDENT_SIZE" value="2" />
+      </indentOptions>
+    </codeStyleSettings>
+  </code_scheme>
+</component>
\ No newline at end of file
diff --git a/.idea/codeStyles/codeStyleConfig.xml b/.idea/codeStyles/codeStyleConfig.xml
new file mode 100644
index 0000000..79ee123
--- /dev/null
+++ b/.idea/codeStyles/codeStyleConfig.xml
@@ -0,0 +1,5 @@
+<component name="ProjectCodeStyleConfiguration">
+  <state>
+    <option name="USE_PER_PROJECT_SETTINGS" value="true" />
+  </state>
+</component>
\ No newline at end of file
diff --git a/.idea/encodings.xml b/.idea/encodings.xml
new file mode 100644
index 0000000..15a15b2
--- /dev/null
+++ b/.idea/encodings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="Encoding" addBOMForNewFiles="with NO BOM" />
+</project>
\ No newline at end of file
diff --git a/.idea/inspectionProfiles/Project_Default.xml b/.idea/inspectionProfiles/Project_Default.xml
new file mode 100644
index 0000000..03d9549
--- /dev/null
+++ b/.idea/inspectionProfiles/Project_Default.xml
@@ -0,0 +1,6 @@
+<component name="InspectionProjectProfileManager">
+  <profile version="1.0">
+    <option name="myName" value="Project Default" />
+    <inspection_tool class="Eslint" enabled="true" level="WARNING" enabled_by_default="true" />
+  </profile>
+</component>
\ No newline at end of file
diff --git a/.idea/misc.xml b/.idea/misc.xml
new file mode 100644
index 0000000..838cad6
--- /dev/null
+++ b/.idea/misc.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="JavaScriptSettings">
+    <option name="languageLevel" value="ES6" />
+  </component>
+  <component name="NodePackageJsonFileManager">
+    <packageJsonPaths />
+  </component>
+  <component name="PreferredVcsStorage">
+    <preferredVcsName>ApexVCS</preferredVcsName>
+  </component>
+  <component name="ProjectRootManager" version="2" project-jdk-name="Python 3.5.2 (/usr/bin/python3.5)" project-jdk-type="Python SDK" />
+</project>
\ No newline at end of file
diff --git a/.idea/modules.xml b/.idea/modules.xml
new file mode 100644
index 0000000..2f45d35
--- /dev/null
+++ b/.idea/modules.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ProjectModuleManager">
+    <modules>
+      <module fileurl="file://$PROJECT_DIR$/.idea/serverless-export-swagger.iml" filepath="$PROJECT_DIR$/.idea/serverless-export-swagger.iml" />
+    </modules>
+  </component>
+</project>
\ No newline at end of file
diff --git a/.idea/serverless-export-swagger.iml b/.idea/serverless-export-swagger.iml
new file mode 100644
index 0000000..6f63a63
--- /dev/null
+++ b/.idea/serverless-export-swagger.iml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module type="PYTHON_MODULE" version="4">
+  <component name="NewModuleRootManager">
+    <content url="file://$MODULE_DIR$" />
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+  </component>
+  <component name="TestRunnerService">
+    <option name="projectConfiguration" value="Nosetests" />
+    <option name="PROJECT_TEST_RUNNER" value="Nosetests" />
+  </component>
+</module>
\ No newline at end of file
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
new file mode 100644
index 0000000..94a25f7
--- /dev/null
+++ b/.idea/vcs.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="VcsDirectoryMappings">
+    <mapping directory="$PROJECT_DIR$" vcs="Git" />
+  </component>
+</project>
\ No newline at end of file
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
new file mode 100644
index 0000000..594dfe5
--- /dev/null
+++ b/.idea/workspace.xml
@@ -0,0 +1,158 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ChangeListManager">
+    <list default="true" id="4233ffbf-288f-4f5d-a434-56c26d9e45b1" name="Default Changelist" comment="">
+      <change beforePath="$PROJECT_DIR$/src/index.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/index.js" afterDir="false" />
+    </list>
+    <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
+    <option name="SHOW_DIALOG" value="false" />
+    <option name="HIGHLIGHT_CONFLICTS" value="true" />
+    <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
+    <option name="LAST_RESOLUTION" value="IGNORE" />
+  </component>
+  <component name="FileEditorManager">
+    <leaf>
+      <file pinned="false" current-in-tab="true">
+        <entry file="file://$PROJECT_DIR$/src/index.js">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="870">
+              <caret line="112" column="56" lean-forward="true" selection-start-line="112" selection-start-column="56" selection-end-line="112" selection-end-column="56" />
+            </state>
+          </provider>
+        </entry>
+      </file>
+    </leaf>
+  </component>
+  <component name="FindInProjectRecents">
+    <findStrings>
+      <find>getswagger</find>
+      <find>key</find>
+    </findStrings>
+  </component>
+  <component name="Git.Settings">
+    <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
+  </component>
+  <component name="IdeDocumentHistory">
+    <option name="CHANGED_PATHS">
+      <list>
+        <option value="$PROJECT_DIR$/src/index.js" />
+      </list>
+    </option>
+  </component>
+  <component name="ProjectFrameBounds">
+    <option name="x" value="1920" />
+    <option name="width" value="1914" />
+    <option name="height" value="2134" />
+  </component>
+  <component name="ProjectView">
+    <navigator proportions="" version="1">
+      <foldersAlwaysOnTop value="true" />
+    </navigator>
+    <panes>
+      <pane id="ProjectPane">
+        <subPane>
+          <expand>
+            <path>
+              <item name="serverless-export-swagger" type="b2602c69:ProjectViewProjectNode" />
+              <item name="serverless-export-swagger" type="462c0819:PsiDirectoryNode" />
+            </path>
+            <path>
+              <item name="serverless-export-swagger" type="b2602c69:ProjectViewProjectNode" />
+              <item name="serverless-export-swagger" type="462c0819:PsiDirectoryNode" />
+              <item name="src" type="462c0819:PsiDirectoryNode" />
+            </path>
+          </expand>
+          <select />
+        </subPane>
+      </pane>
+      <pane id="Scope" />
+    </panes>
+  </component>
+  <component name="PropertiesComponent">
+    <property name="WebServerToolWindowFactoryState" value="false" />
+    <property name="last_opened_file_path" value="$PROJECT_DIR$" />
+    <property name="node.js.detected.package.eslint" value="true" />
+    <property name="node.js.path.for.package.eslint" value="project" />
+    <property name="node.js.selected.package.eslint" value="$PROJECT_DIR$/node_modules/eslint" />
+    <property name="nodejs_interpreter_path.stuck_in_default_project" value="undefined stuck path" />
+    <property name="nodejs_npm_path_reset_for_default_project" value="true" />
+    <property name="nodejs_package_manager_path" value="npm" />
+    <property name="settings.editor.selected.configurable" value="configurable.group.appearance" />
+  </component>
+  <component name="RunDashboard">
+    <option name="ruleStates">
+      <list>
+        <RuleState>
+          <option name="name" value="ConfigurationTypeDashboardGroupingRule" />
+        </RuleState>
+        <RuleState>
+          <option name="name" value="StatusDashboardGroupingRule" />
+        </RuleState>
+      </list>
+    </option>
+  </component>
+  <component name="RunManager">
+    <configuration name="index.js" type="NodeJSConfigurationType" temporary="true" nameIsGenerated="true" path-to-js-file="$PROJECT_DIR$/src/index.js" working-dir="$PROJECT_DIR$">
+      <method v="2" />
+    </configuration>
+    <recent_temporary>
+      <list>
+        <item itemvalue="Node.js.index.js" />
+      </list>
+    </recent_temporary>
+  </component>
+  <component name="TaskManager">
+    <task active="true" id="Default" summary="Default task">
+      <changelist id="4233ffbf-288f-4f5d-a434-56c26d9e45b1" name="Default Changelist" comment="" />
+      <created>1551198262428</created>
+      <option name="number" value="Default" />
+      <option name="presentableId" value="Default" />
+      <updated>1551198262428</updated>
+      <workItem from="1551198265778" duration="1215000" />
+    </task>
+    <servers />
+  </component>
+  <component name="TimeTrackingManager">
+    <option name="totallyTimeSpent" value="1215000" />
+  </component>
+  <component name="ToolWindowManager">
+    <frame x="1920" y="0" width="1914" height="2134" extended-state="0" />
+    <editor active="true" />
+    <layout>
+      <window_info id="aws.explorer" side_tool="true" />
+      <window_info id="Favorites" side_tool="true" />
+      <window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.24973261" />
+      <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
+      <window_info anchor="bottom" id="Docker" />
+      <window_info anchor="bottom" id="Database Changes" />
+      <window_info anchor="bottom" id="Version Control" />
+      <window_info anchor="bottom" id="Python Console" />
+      <window_info active="true" anchor="bottom" id="Terminal" visible="true" weight="0.32972974" />
+      <window_info anchor="bottom" id="Event Log" side_tool="true" />
+      <window_info anchor="bottom" id="Message" order="0" />
+      <window_info anchor="bottom" id="Find" order="1" />
+      <window_info anchor="bottom" id="Run" order="2" weight="0.32972974" />
+      <window_info anchor="bottom" id="Debug" order="3" weight="0.4" />
+      <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
+      <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
+      <window_info anchor="bottom" id="TODO" order="6" />
+      <window_info anchor="right" id="SciView" />
+      <window_info anchor="right" id="Database" />
+      <window_info anchor="right" id="Commander" order="0" weight="0.4" />
+      <window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
+      <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
+    </layout>
+  </component>
+  <component name="TypeScriptGeneratedFilesManager">
+    <option name="version" value="1" />
+  </component>
+  <component name="editorHistoryManager">
+    <entry file="file://$PROJECT_DIR$/src/index.js">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="870">
+          <caret line="112" column="56" lean-forward="true" selection-start-line="112" selection-start-column="56" selection-end-line="112" selection-end-column="56" />
+        </state>
+      </provider>
+    </entry>
+  </component>
+</project>
\ No newline at end of file
diff --git a/src/index.js b/src/index.js
index 4d2ebdf..76f04e2 100644
--- a/src/index.js
+++ b/src/index.js
@@ -38,6 +38,57 @@ const getSwagger = async function getSwagger(apiName, stage, region, creds) {
   return swagger
 }
 
+const getSwaggerYaml = async function getSwagger(apiName, stage, region, creds) {
+  const ag = new AWS.APIGateway({
+    credentials: creds,
+    region,
+  })
+  const swaggeryaml = await ag.getExport({
+    exportType: 'swagger',
+    restApiId: apiName,
+    stageName: stage,
+    accepts: 'application/yaml',
+    parameters: {
+      extensions: 'integrations',
+    },
+  }).promise()
+  return swaggeryaml
+}
+
+const getOpenapi = async function getOpenapi(apiName, stage, region, creds) {
+  const ag = new AWS.APIGateway({
+    credentials: creds,
+    region,
+  })
+  const oas30 = await ag.getExport({
+    exportType: 'oas30',
+    restApiId: apiName,
+    stageName: stage,
+    accepts: 'application/json',
+    parameters: {
+      extensions: 'integrations',
+    },
+  }).promise()
+  return oas30
+}
+
+const getOpenapiYaml = async function getOpenapi(apiName, stage, region, creds) {
+  const ag = new AWS.APIGateway({
+    credentials: creds,
+    region,
+  })
+  const oas30yaml = await ag.getExport({
+    exportType: 'oas30',
+    restApiId: apiName,
+    stageName: stage,
+    accepts: 'application/yaml',
+    parameters: {
+      extensions: 'integrations',
+    },
+  }).promise()
+  return oas30yaml
+}
+
 const uploadSwaggerToS3 = async function uploadSwaggerToS3(swagger, bucket, key, region, creds) {
   const s3 = new AWS.S3({
     credentials: creds,
@@ -68,8 +119,19 @@ const exportApi = async function exportApi(serverless) {
   const { bucket, key } = getBucketAndKey(serverless)
   const apiName = await getApiName(serviceName, stage, region, awsCredentials)
   const swagger = await getSwagger(apiName, stage, region, awsCredentials)
-  await uploadSwaggerToS3(swagger, bucket, key, region, awsCredentials)
-  serverless.cli.consoleLog('ExportSwagger: File uploaded to s3.')
+  const swaggeryaml = await getSwaggerYaml(apiName, stage, region, awsCredentials)
+  const oas30 = await getOpenapi(apiName, stage, region, awsCredentials)
+  const oas30yaml = await getOpenapiYaml(apiName, stage, region, awsCredentials)
+  var swaggerKey = key+'-swagger.json'
+  await uploadSwaggerToS3(swagger, bucket, swaggerKey, region, awsCredentials)
+  var oas30Key = key+'-oas30.json'
+  await uploadSwaggerToS3(oas30, bucket, oas30Key, region, awsCredentials)
+  var swaggerYamlKey = key+'-swagger.yaml'
+  await uploadSwaggerToS3(swaggeryaml, bucket, swaggerYamlKey, region, awsCredentials)
+  var oas30YamlKey = key+'-oas30.yaml'
+  await uploadSwaggerToS3(oas30yaml, bucket, oas30YamlKey, region, awsCredentials)
+
+  serverless.cli.consoleLog('ExportSwagger: Files uploaded to s3.')
 }
 
 /**

From aeef5be3401e37d89f82e78a26c1357b0eee7c00 Mon Sep 17 00:00:00 2001
From: Justin Lyons <jlyons@hueyscomputers.com>
Date: Tue, 26 Feb 2019 12:02:27 -0500
Subject: [PATCH 2/5] Update gitignore

---
 .gitignore          |  2 ++
 .idea/workspace.xml | 16 ++++++++--------
 package-lock.json   |  6 +++---
 package.json        |  2 +-
 4 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/.gitignore b/.gitignore
index 00cbbdf..4460c35 100644
--- a/.gitignore
+++ b/.gitignore
@@ -57,3 +57,5 @@ typings/
 # dotenv environment variables file
 .env
 
+# intellij files
+.idea/
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 594dfe5..2037848 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -2,7 +2,8 @@
 <project version="4">
   <component name="ChangeListManager">
     <list default="true" id="4233ffbf-288f-4f5d-a434-56c26d9e45b1" name="Default Changelist" comment="">
-      <change beforePath="$PROJECT_DIR$/src/index.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/index.js" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/package-lock.json" beforeDir="false" afterPath="$PROJECT_DIR$/package-lock.json" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/package.json" beforeDir="false" afterPath="$PROJECT_DIR$/package.json" afterDir="false" />
     </list>
     <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
     <option name="SHOW_DIALOG" value="false" />
@@ -15,8 +16,8 @@
       <file pinned="false" current-in-tab="true">
         <entry file="file://$PROJECT_DIR$/src/index.js">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="870">
-              <caret line="112" column="56" lean-forward="true" selection-start-line="112" selection-start-column="56" selection-end-line="112" selection-end-column="56" />
+            <state relative-caret-position="991">
+              <caret line="138" column="3" selection-end-line="152" />
             </state>
           </provider>
         </entry>
@@ -108,16 +109,15 @@
       <option name="number" value="Default" />
       <option name="presentableId" value="Default" />
       <updated>1551198262428</updated>
-      <workItem from="1551198265778" duration="1215000" />
+      <workItem from="1551198265778" duration="2179000" />
     </task>
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="1215000" />
+    <option name="totallyTimeSpent" value="2179000" />
   </component>
   <component name="ToolWindowManager">
     <frame x="1920" y="0" width="1914" height="2134" extended-state="0" />
-    <editor active="true" />
     <layout>
       <window_info id="aws.explorer" side_tool="true" />
       <window_info id="Favorites" side_tool="true" />
@@ -149,8 +149,8 @@
   <component name="editorHistoryManager">
     <entry file="file://$PROJECT_DIR$/src/index.js">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="870">
-          <caret line="112" column="56" lean-forward="true" selection-start-line="112" selection-start-column="56" selection-end-line="112" selection-end-column="56" />
+        <state relative-caret-position="991">
+          <caret line="138" column="3" selection-end-line="152" />
         </state>
       </provider>
     </entry>
diff --git a/package-lock.json b/package-lock.json
index 1249bc1..055e1a9 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -99,9 +99,9 @@
       "dev": true
     },
     "aws-sdk": {
-      "version": "2.385.0",
-      "resolved": "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.385.0.tgz",
-      "integrity": "sha512-ensf8QVbFdHQYLwhHgkH0FpE7nVxDl1SYJMM09p7neveW48rxQEwSOi/BmXDuI2/xsm7aHASUEZqK6zzeEx77g==",
+      "version": "2.410.0",
+      "resolved": "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.410.0.tgz",
+      "integrity": "sha512-1ekVT5gr1m2yJXHZbHb8TAJogLA3Xj//b7yffHNXScAjFx2KNE+hmJ29J716372C0HDNgIPTKqWBp+lsYhvrjA==",
       "requires": {
         "buffer": "4.9.1",
         "events": "1.1.1",
diff --git a/package.json b/package.json
index 8c90744..64b7c5b 100644
--- a/package.json
+++ b/package.json
@@ -30,6 +30,6 @@
     "eslint-plugin-react": "^7.5.1"
   },
   "dependencies": {
-    "aws-sdk": "^2.385.0"
+    "aws-sdk": "^2.410.0"
   }
 }

From 4583005f45cbcf8b2cab4bc2ba663957c443fe62 Mon Sep 17 00:00:00 2001
From: Justin Lyons <jlyons@hueyscomputers.com>
Date: Tue, 26 Feb 2019 12:02:35 -0500
Subject: [PATCH 3/5] Update gitignore

---
 .idea/aws.xml                                |  11 --
 .idea/codeStyles/Project.xml                 |  26 ---
 .idea/codeStyles/codeStyleConfig.xml         |   5 -
 .idea/encodings.xml                          |   4 -
 .idea/inspectionProfiles/Project_Default.xml |   6 -
 .idea/misc.xml                               |  13 --
 .idea/modules.xml                            |   8 -
 .idea/serverless-export-swagger.iml          |  12 --
 .idea/vcs.xml                                |   6 -
 .idea/workspace.xml                          | 158 -------------------
 10 files changed, 249 deletions(-)
 delete mode 100644 .idea/aws.xml
 delete mode 100644 .idea/codeStyles/Project.xml
 delete mode 100644 .idea/codeStyles/codeStyleConfig.xml
 delete mode 100644 .idea/encodings.xml
 delete mode 100644 .idea/inspectionProfiles/Project_Default.xml
 delete mode 100644 .idea/misc.xml
 delete mode 100644 .idea/modules.xml
 delete mode 100644 .idea/serverless-export-swagger.iml
 delete mode 100644 .idea/vcs.xml
 delete mode 100644 .idea/workspace.xml

diff --git a/.idea/aws.xml b/.idea/aws.xml
deleted file mode 100644
index 1ea8305..0000000
--- a/.idea/aws.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="accountSettings">
-    <option name="activeProfile" value="profile:default" />
-    <option name="recentlyUsedProfiles">
-      <list>
-        <option value="profile:default" />
-      </list>
-    </option>
-  </component>
-</project>
\ No newline at end of file
diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml
deleted file mode 100644
index fa043ab..0000000
--- a/.idea/codeStyles/Project.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<component name="ProjectCodeStyleConfiguration">
-  <code_scheme name="Project" version="173">
-    <option name="ALIGN_MULTILINE_PARAMETERS_IN_CALLS" value="true" />
-    <JSCodeStyleSettings version="0">
-      <option name="USE_SEMICOLON_AFTER_STATEMENT" value="false" />
-      <option name="FORCE_SEMICOLON_STYLE" value="true" />
-      <option name="USE_DOUBLE_QUOTES" value="false" />
-      <option name="FORCE_QUOTE_STYlE" value="true" />
-      <option name="VAR_DECLARATION_WRAP" value="2" />
-      <option name="OBJECT_LITERAL_WRAP" value="2" />
-      <option name="SPACES_WITHIN_OBJECT_LITERAL_BRACES" value="true" />
-      <option name="SPACES_WITHIN_IMPORTS" value="true" />
-    </JSCodeStyleSettings>
-    <codeStyleSettings language="JavaScript">
-      <option name="METHOD_CALL_CHAIN_WRAP" value="2" />
-      <option name="IF_BRACE_FORCE" value="1" />
-      <option name="DOWHILE_BRACE_FORCE" value="1" />
-      <option name="WHILE_BRACE_FORCE" value="1" />
-      <option name="FOR_BRACE_FORCE" value="1" />
-      <indentOptions>
-        <option name="INDENT_SIZE" value="2" />
-        <option name="CONTINUATION_INDENT_SIZE" value="2" />
-      </indentOptions>
-    </codeStyleSettings>
-  </code_scheme>
-</component>
\ No newline at end of file
diff --git a/.idea/codeStyles/codeStyleConfig.xml b/.idea/codeStyles/codeStyleConfig.xml
deleted file mode 100644
index 79ee123..0000000
--- a/.idea/codeStyles/codeStyleConfig.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<component name="ProjectCodeStyleConfiguration">
-  <state>
-    <option name="USE_PER_PROJECT_SETTINGS" value="true" />
-  </state>
-</component>
\ No newline at end of file
diff --git a/.idea/encodings.xml b/.idea/encodings.xml
deleted file mode 100644
index 15a15b2..0000000
--- a/.idea/encodings.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="Encoding" addBOMForNewFiles="with NO BOM" />
-</project>
\ No newline at end of file
diff --git a/.idea/inspectionProfiles/Project_Default.xml b/.idea/inspectionProfiles/Project_Default.xml
deleted file mode 100644
index 03d9549..0000000
--- a/.idea/inspectionProfiles/Project_Default.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<component name="InspectionProjectProfileManager">
-  <profile version="1.0">
-    <option name="myName" value="Project Default" />
-    <inspection_tool class="Eslint" enabled="true" level="WARNING" enabled_by_default="true" />
-  </profile>
-</component>
\ No newline at end of file
diff --git a/.idea/misc.xml b/.idea/misc.xml
deleted file mode 100644
index 838cad6..0000000
--- a/.idea/misc.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="JavaScriptSettings">
-    <option name="languageLevel" value="ES6" />
-  </component>
-  <component name="NodePackageJsonFileManager">
-    <packageJsonPaths />
-  </component>
-  <component name="PreferredVcsStorage">
-    <preferredVcsName>ApexVCS</preferredVcsName>
-  </component>
-  <component name="ProjectRootManager" version="2" project-jdk-name="Python 3.5.2 (/usr/bin/python3.5)" project-jdk-type="Python SDK" />
-</project>
\ No newline at end of file
diff --git a/.idea/modules.xml b/.idea/modules.xml
deleted file mode 100644
index 2f45d35..0000000
--- a/.idea/modules.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="ProjectModuleManager">
-    <modules>
-      <module fileurl="file://$PROJECT_DIR$/.idea/serverless-export-swagger.iml" filepath="$PROJECT_DIR$/.idea/serverless-export-swagger.iml" />
-    </modules>
-  </component>
-</project>
\ No newline at end of file
diff --git a/.idea/serverless-export-swagger.iml b/.idea/serverless-export-swagger.iml
deleted file mode 100644
index 6f63a63..0000000
--- a/.idea/serverless-export-swagger.iml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module type="PYTHON_MODULE" version="4">
-  <component name="NewModuleRootManager">
-    <content url="file://$MODULE_DIR$" />
-    <orderEntry type="inheritedJdk" />
-    <orderEntry type="sourceFolder" forTests="false" />
-  </component>
-  <component name="TestRunnerService">
-    <option name="projectConfiguration" value="Nosetests" />
-    <option name="PROJECT_TEST_RUNNER" value="Nosetests" />
-  </component>
-</module>
\ No newline at end of file
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
deleted file mode 100644
index 94a25f7..0000000
--- a/.idea/vcs.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="VcsDirectoryMappings">
-    <mapping directory="$PROJECT_DIR$" vcs="Git" />
-  </component>
-</project>
\ No newline at end of file
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
deleted file mode 100644
index 2037848..0000000
--- a/.idea/workspace.xml
+++ /dev/null
@@ -1,158 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="ChangeListManager">
-    <list default="true" id="4233ffbf-288f-4f5d-a434-56c26d9e45b1" name="Default Changelist" comment="">
-      <change beforePath="$PROJECT_DIR$/package-lock.json" beforeDir="false" afterPath="$PROJECT_DIR$/package-lock.json" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/package.json" beforeDir="false" afterPath="$PROJECT_DIR$/package.json" afterDir="false" />
-    </list>
-    <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
-    <option name="SHOW_DIALOG" value="false" />
-    <option name="HIGHLIGHT_CONFLICTS" value="true" />
-    <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
-    <option name="LAST_RESOLUTION" value="IGNORE" />
-  </component>
-  <component name="FileEditorManager">
-    <leaf>
-      <file pinned="false" current-in-tab="true">
-        <entry file="file://$PROJECT_DIR$/src/index.js">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="991">
-              <caret line="138" column="3" selection-end-line="152" />
-            </state>
-          </provider>
-        </entry>
-      </file>
-    </leaf>
-  </component>
-  <component name="FindInProjectRecents">
-    <findStrings>
-      <find>getswagger</find>
-      <find>key</find>
-    </findStrings>
-  </component>
-  <component name="Git.Settings">
-    <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
-  </component>
-  <component name="IdeDocumentHistory">
-    <option name="CHANGED_PATHS">
-      <list>
-        <option value="$PROJECT_DIR$/src/index.js" />
-      </list>
-    </option>
-  </component>
-  <component name="ProjectFrameBounds">
-    <option name="x" value="1920" />
-    <option name="width" value="1914" />
-    <option name="height" value="2134" />
-  </component>
-  <component name="ProjectView">
-    <navigator proportions="" version="1">
-      <foldersAlwaysOnTop value="true" />
-    </navigator>
-    <panes>
-      <pane id="ProjectPane">
-        <subPane>
-          <expand>
-            <path>
-              <item name="serverless-export-swagger" type="b2602c69:ProjectViewProjectNode" />
-              <item name="serverless-export-swagger" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="serverless-export-swagger" type="b2602c69:ProjectViewProjectNode" />
-              <item name="serverless-export-swagger" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-            </path>
-          </expand>
-          <select />
-        </subPane>
-      </pane>
-      <pane id="Scope" />
-    </panes>
-  </component>
-  <component name="PropertiesComponent">
-    <property name="WebServerToolWindowFactoryState" value="false" />
-    <property name="last_opened_file_path" value="$PROJECT_DIR$" />
-    <property name="node.js.detected.package.eslint" value="true" />
-    <property name="node.js.path.for.package.eslint" value="project" />
-    <property name="node.js.selected.package.eslint" value="$PROJECT_DIR$/node_modules/eslint" />
-    <property name="nodejs_interpreter_path.stuck_in_default_project" value="undefined stuck path" />
-    <property name="nodejs_npm_path_reset_for_default_project" value="true" />
-    <property name="nodejs_package_manager_path" value="npm" />
-    <property name="settings.editor.selected.configurable" value="configurable.group.appearance" />
-  </component>
-  <component name="RunDashboard">
-    <option name="ruleStates">
-      <list>
-        <RuleState>
-          <option name="name" value="ConfigurationTypeDashboardGroupingRule" />
-        </RuleState>
-        <RuleState>
-          <option name="name" value="StatusDashboardGroupingRule" />
-        </RuleState>
-      </list>
-    </option>
-  </component>
-  <component name="RunManager">
-    <configuration name="index.js" type="NodeJSConfigurationType" temporary="true" nameIsGenerated="true" path-to-js-file="$PROJECT_DIR$/src/index.js" working-dir="$PROJECT_DIR$">
-      <method v="2" />
-    </configuration>
-    <recent_temporary>
-      <list>
-        <item itemvalue="Node.js.index.js" />
-      </list>
-    </recent_temporary>
-  </component>
-  <component name="TaskManager">
-    <task active="true" id="Default" summary="Default task">
-      <changelist id="4233ffbf-288f-4f5d-a434-56c26d9e45b1" name="Default Changelist" comment="" />
-      <created>1551198262428</created>
-      <option name="number" value="Default" />
-      <option name="presentableId" value="Default" />
-      <updated>1551198262428</updated>
-      <workItem from="1551198265778" duration="2179000" />
-    </task>
-    <servers />
-  </component>
-  <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="2179000" />
-  </component>
-  <component name="ToolWindowManager">
-    <frame x="1920" y="0" width="1914" height="2134" extended-state="0" />
-    <layout>
-      <window_info id="aws.explorer" side_tool="true" />
-      <window_info id="Favorites" side_tool="true" />
-      <window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.24973261" />
-      <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
-      <window_info anchor="bottom" id="Docker" />
-      <window_info anchor="bottom" id="Database Changes" />
-      <window_info anchor="bottom" id="Version Control" />
-      <window_info anchor="bottom" id="Python Console" />
-      <window_info active="true" anchor="bottom" id="Terminal" visible="true" weight="0.32972974" />
-      <window_info anchor="bottom" id="Event Log" side_tool="true" />
-      <window_info anchor="bottom" id="Message" order="0" />
-      <window_info anchor="bottom" id="Find" order="1" />
-      <window_info anchor="bottom" id="Run" order="2" weight="0.32972974" />
-      <window_info anchor="bottom" id="Debug" order="3" weight="0.4" />
-      <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
-      <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
-      <window_info anchor="bottom" id="TODO" order="6" />
-      <window_info anchor="right" id="SciView" />
-      <window_info anchor="right" id="Database" />
-      <window_info anchor="right" id="Commander" order="0" weight="0.4" />
-      <window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
-      <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
-    </layout>
-  </component>
-  <component name="TypeScriptGeneratedFilesManager">
-    <option name="version" value="1" />
-  </component>
-  <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/src/index.js">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="991">
-          <caret line="138" column="3" selection-end-line="152" />
-        </state>
-      </provider>
-    </entry>
-  </component>
-</project>
\ No newline at end of file

From 55a348d0037107ba738aa968e6cebe06afd61bb9 Mon Sep 17 00:00:00 2001
From: Justin Lyons <jlyons@hueyscomputers.com>
Date: Wed, 27 Feb 2019 09:46:51 -0500
Subject: [PATCH 4/5] Add new options from serverless to allow choice of
 openapi and yaml files. Renamed getBucketAndKey to getServerlessOptions.

---
 README.md    |  3 +++
 package.json |  2 +-
 src/index.js | 27 ++++++++++++++++-----------
 3 files changed, 20 insertions(+), 12 deletions(-)

diff --git a/README.md b/README.md
index 34de199..afc2931 100644
--- a/README.md
+++ b/README.md
@@ -24,4 +24,7 @@ custom:
     s3KeyName: 'swagger/api.json'
     # optional, default: private
     acl: public-read
+    #optional settings to upload yaml and openapi files.
+    uploadOpenAPI: true
+    uploadYaml: true
 ```
diff --git a/package.json b/package.json
index 64b7c5b..e2d8cc5 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "serverless-export-swagger",
-  "version": "2.0.0",
+  "version": "2.0.1",
   "description": "export swagger definition to s3 ",
   "main": "src/index.js",
   "scripts": {
diff --git a/src/index.js b/src/index.js
index 76f04e2..0ad8def 100644
--- a/src/index.js
+++ b/src/index.js
@@ -101,14 +101,16 @@ const uploadSwaggerToS3 = async function uploadSwaggerToS3(swagger, bucket, key,
   }).promise()
 }
 
-const getBucketAndKey = function getBucketAndKey(serverless) {
+const getServerlessOptions = function getServerlessOptions(serverless) {
   const bucket = serverless.service.custom.swaggerDestinations.s3BucketName
   const key = serverless.service.custom.swaggerDestinations.s3KeyName
+  const openapi = serverless.service.custom.swaggerDestinations.uploadOpenAPI
+  const yaml = serverless.service.custom.swaggerDestinations.uploadYaml
   if (!bucket || !key) {
     throw new Error('ExportSwagger: Bucket name and key are required fields')
   }
-  return { bucket, key }
-};
+  return { bucket, key, openapi, yaml }
+}
 
 const exportApi = async function exportApi(serverless) {
   const provider = serverless.getProvider('aws')
@@ -116,20 +118,23 @@ const exportApi = async function exportApi(serverless) {
   const region = provider.getRegion()
   const stage = provider.getStage()
   const serviceName = serverless.service.getServiceName()
-  const { bucket, key } = getBucketAndKey(serverless)
+  const { bucket, key, openapi, yaml } = getServerlessOptions(serverless)
   const apiName = await getApiName(serviceName, stage, region, awsCredentials)
   const swagger = await getSwagger(apiName, stage, region, awsCredentials)
   const swaggeryaml = await getSwaggerYaml(apiName, stage, region, awsCredentials)
   const oas30 = await getOpenapi(apiName, stage, region, awsCredentials)
   const oas30yaml = await getOpenapiYaml(apiName, stage, region, awsCredentials)
-  var swaggerKey = key+'-swagger.json'
+  const swaggerKey = `${key}-swagger.json`
   await uploadSwaggerToS3(swagger, bucket, swaggerKey, region, awsCredentials)
-  var oas30Key = key+'-oas30.json'
-  await uploadSwaggerToS3(oas30, bucket, oas30Key, region, awsCredentials)
-  var swaggerYamlKey = key+'-swagger.yaml'
-  await uploadSwaggerToS3(swaggeryaml, bucket, swaggerYamlKey, region, awsCredentials)
-  var oas30YamlKey = key+'-oas30.yaml'
-  await uploadSwaggerToS3(oas30yaml, bucket, oas30YamlKey, region, awsCredentials)
+  if (typeof openapi !== 'undefined') {
+    const oas30Key = `${key}-oas30.json`
+    await uploadSwaggerToS3(oas30, bucket, oas30Key, region, awsCredentials) }
+  if (typeof yaml !== 'undefined') {
+    const swaggerYamlKey = `${key}-swagger.yaml`
+    await uploadSwaggerToS3(swaggeryaml, bucket, swaggerYamlKey, region, awsCredentials) }
+  if (typeof openapi !== 'undefined' && typeof yaml !== 'undefined') {
+    const oas30YamlKey = `${key}-oas30.yaml`
+    await uploadSwaggerToS3(oas30yaml, bucket, oas30YamlKey, region, awsCredentials) }
 
   serverless.cli.consoleLog('ExportSwagger: Files uploaded to s3.')
 }

From 30574c54285c9299cfe8ca45b1b4bc6c2779b5c8 Mon Sep 17 00:00:00 2001
From: Justin Lyons <jlyons@hueyscomputers.com>
Date: Wed, 27 Feb 2019 09:56:09 -0500
Subject: [PATCH 5/5] Fix Readme to not use file type

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index afc2931..3d620ab 100644
--- a/README.md
+++ b/README.md
@@ -21,7 +21,7 @@ plugins:
 custom:
   swaggerDestinations:
     s3BucketName: 'bucket-name'
-    s3KeyName: 'swagger/api.json'
+    s3KeyName: 'swagger/api'
     # optional, default: private
     acl: public-read
     #optional settings to upload yaml and openapi files.