fixed stack name

Author: AndrewChubatiuk

lib/index.ts

@@ -3,10 +3,10 @@ import { join } from 'path';
 import { Provider, ServerlessClasses, ServerlessLogger } from './specs'
 
 interface ServerlessProvider {
+    stackName: string;
     naming: {
         getCompiledTemplateFileName: () => string;
-        getStackName: () => string;
-    },
+    }
 }
 
 interface DiffCommon {
@@ -38,7 +38,6 @@ interface Serverless {
 class ServerlessPlugin {
     protected serverless: Serverless;
     protected newTemplateFile: string;
-    protected specName: string;
     protected _specProvider: Provider;
     protected providerName: string;
     protected log: ServerlessLogger;
@@ -82,7 +81,6 @@ class ServerlessPlugin {
             '.serverless',
             newTemplateName,
         );
-        this.specName = provider.naming.getStackName();
     }
 
     public get specProvider() {
@@ -111,7 +109,8 @@ class ServerlessPlugin {
         try {
             const data = await readFile(this.newTemplateFile, 'utf8');
             const newTemplate = JSON.parse(data);
-            return this._specProvider.diff(this.specName, newTemplate);
+            const stackName = this.serverless.service.provider.stackName;
+            return this._specProvider.diff(stackName, newTemplate);
         } catch (err) {
             if (err.code === 'ENOENT') {
                 const errorPrefix = `${this.newTemplateFile} could not be found`;

lib/providers/aws.ts

@@ -59,9 +59,9 @@ export class SpecProvider extends SpecProviderBase<AWSProvider, AWSConfig> {
         return report;
     }
 
-    async diff(specName: string, newTemplate: Template) {
+    async diff(stackName: string, newTemplate: Template) {
         const command = new GetTemplateCommand({
-            StackName: specName,
+            StackName: stackName,
             TemplateStage: 'Processed',
         });
         try {

lib/specs.ts

@@ -11,7 +11,7 @@ export interface ConfigBase {
 }
 
 export interface Provider {
-    diff: (specName: string, newTemplate: Template) => void;
+    diff: (stackName: string, newTemplate: Template) => void;
 }
 
 type ErrorClass = { new(msg: string): void; }
@@ -30,7 +30,7 @@ export abstract class SpecProviderBase<ServerlessProvider, Config extends Config
     protected log: ServerlessLogger;
     protected classes: ServerlessClasses;
 
-    abstract diff(specName: string, newTemplate: Template): void;
+    abstract diff(stackName: string, newTemplate: Template): void;
     protected abstract setup();
 
     constructor(provider: ServerlessProvider, config: Config, log: ServerlessLogger, classes: ServerlessClasses) {

test/index.test.ts

@@ -51,8 +51,8 @@ beforeEach(async () => {
                 name: `provider-${suffix}`,
                 stage: `stage-${suffix}`,
                 region: 'eu-west-1',
+                stackName: `stack-${suffix}`,
                 naming: {
-                    getStackName: () => `stack-${suffix}`,
                     getCompiledTemplateFileName: () => `template-${suffix}.json`,
                 },
             },
@@ -108,9 +108,9 @@ describe('serverless-plugin-diff', () => {
                     setup() {
                         this.log.info('inside provider setup()');
                     }
-                    async diff(specName: string, newTpl: Template) {
-                        this.log.info(`${specName}-${newTpl}`);
-                        return { specName: specName };
+                    async diff(stackName: string, newTpl: Template) {
+                        this.log.info(`${stackName}-${newTpl}`);
+                        return { stackName: stackName };
                     }
                 }
             }
@@ -134,7 +134,7 @@ describe('serverless-plugin-diff', () => {
         test('generate valid diff', async () => {
             await plugin.load();
             expect(await plugin.diff()).toMatchObject({
-                specName: serverless.service.provider.naming.getStackName(),
+                stackName: serverless.service.provider.stackName,
             });
         });
         test('unknown error during diff generation', async () => {
@@ -188,8 +188,8 @@ describe('serverless-plugin-diff', () => {
                         setup() {
                             this.log.info('inside provider setup()');
                         }
-                        diff(specName: string, newTpl: Template) {
-                            this.log.info(`${specName}-${newTpl}`);
+                        diff(stackName: string, newTpl: Template) {
+                            this.log.info(`${stackName}-${newTpl}`);
                             throw new Error('Error');
                         }
                     }