removed more references to serverless.env.yaml

serverless · Aug 22, 2016 · c629b49 · c629b49
1 parent 61d657d
commit c629b49
Show file tree

Hide file tree

Showing 6 changed files with 2 additions and 40 deletions.
diff --git a/README.md b/README.md
@@ -55,7 +55,7 @@ Run `serverless remove` to clean up this function from your account.
 - **[Understanding Serverless and its configuration files](docs/understanding-serverless)**
   - [Serverless services and functions](docs/understanding-serverless/services-and-functions.md)
   - [serverless.yml](docs/understanding-serverless/serverless-yml.md)
-  - [serverless.env.yml](docs/understanding-serverless/serverless-env-yml.md)
+  - [serverless variables](docs/understanding-serverless/serverless-variables.md)
 - **[How to build your Serverless services](docs/guide)**
   - [Installing Serverless](docs/guide/installation.md)
   - [Provider account setup](docs/guide/provider-account-setup.md)

diff --git a/lib/plugins/aws/deploy/tests/createStack.js b/lib/plugins/aws/deploy/tests/createStack.js
@@ -13,7 +13,6 @@ describe('createStack', () => {
   let awsDeploy;
 
   const tmpDirPath = path.join(os.tmpdir(), (new Date()).getTime().toString());
-  const serverlessEnvYmlPath = path.join(tmpDirPath, 'serverless.env.yml');
   const serverlessYmlPath = path.join(tmpDirPath, 'serverless.yml');
   const serverlessYml = {
     service: 'first-service',
@@ -24,24 +23,10 @@ describe('createStack', () => {
       },
     },
   };
-  const serverlessEnvYml = {
-    vars: {},
-    stages: {
-      dev: {
-        vars: {},
-        regions: {
-          'us-east-1': {
-            vars: {},
-          },
-        },
-      },
-    },
-  };
 
   beforeEach(() => {
     serverless = new Serverless();
     serverless.utils.writeFileSync(serverlessYmlPath, serverlessYml);
-    serverless.utils.writeFileSync(serverlessEnvYmlPath, serverlessEnvYml);
     serverless.config.servicePath = tmpDirPath;
     const options = {
       stage: 'dev',

diff --git a/lib/plugins/aws/deploy/tests/updateStack.js b/lib/plugins/aws/deploy/tests/updateStack.js
@@ -13,20 +13,6 @@ describe('updateStack', () => {
   let awsDeploy;
 
   const tmpDirPath = path.join(os.tmpdir(), (new Date()).getTime().toString());
-  const serverlessEnvYmlPath = path.join(tmpDirPath, 'serverless.env.yml');
-  const serverlessEnvYml = {
-    vars: {},
-    stages: {
-      dev: {
-        vars: {},
-        regions: {
-          'us-east-1': {
-            vars: {},
-          },
-        },
-      },
-    },
-  };
 
   beforeEach(() => {
     serverless = new Serverless();
@@ -40,7 +26,6 @@ describe('updateStack', () => {
     awsDeploy.bucketName = 'deployment-bucket';
     serverless.service.service = `service-${(new Date()).getTime().toString()}`;
     serverless.config.servicePath = tmpDirPath;
-    serverless.utils.writeFileSync(serverlessEnvYmlPath, serverlessEnvYml);
     awsDeploy.serverless.cli = new serverless.classes.CLI();
   });
 

diff --git a/lib/plugins/package/README.md b/lib/plugins/package/README.md
@@ -12,7 +12,7 @@ upon zipping the service. The resulting path to the artifact will be appended to
 The services `include` and `exclude` arrays are considered during zipping. At first the `exclude` will be applied. After
 that the `include` will be applied to ensure that previously excluded files and folders can be included again.
 
-Serverless will automatically exclude `.git`, `.gitignore`, `serverless.yml`, `serverless.env.yml` and `.DS_Store`.
+Serverless will automatically exclude `.git`, `.gitignore`, `serverless.yml`, and `.DS_Store`.
 
 Servlerless will skip this step if the user has defined it's own artifact in the `service.package.artifact` property.
 

diff --git a/lib/plugins/package/lib/zipService.js b/lib/plugins/package/lib/zipService.js
@@ -27,8 +27,6 @@ module.exports = {
       '.DS_Store',
       'serverless.yaml',
       'serverless.yml',
-      'serverless.env.yaml',
-      'serverless.env.yml',
       '.serverless',
     ]);
 

diff --git a/lib/plugins/package/tests/zipService.js b/lib/plugins/package/tests/zipService.js
@@ -56,9 +56,6 @@ describe('#zipService()', () => {
     // serverless.yml
     const serverlessYmlFilePath = path.join(tmpDirPath, 'serverless.yml');
     serverless.utils.writeFileSync(serverlessYmlFilePath, 'serverless.yml file content');
-    // serverless.env.yml
-    const serverlessEnvYmlFilePath = path.join(tmpDirPath, 'serverless.env.yml');
-    serverless.utils.writeFileSync(serverlessEnvYmlFilePath, 'serverless.env.yml file content');
     // .git
     const gitFilePath = path.join(path.join(tmpDirPath, '.git'), 'some-git-file');
     serverless.utils.writeFileSync(gitFilePath, 'some-git-file content');
@@ -202,9 +199,6 @@ describe('#zipService()', () => {
       expect(unzippedFileData['serverless.yml'])
         .to.be.equal(undefined);
 
-      expect(unzippedFileData['serverless.env.yml'])
-        .to.be.equal(undefined);
-
       expect(unzippedFileData['.git/some-git-file'])
         .to.equal(undefined);
     })