Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fixing serverless-wsgi to work on >=2.32 #189

Merged
merged 3 commits into from
Aug 24, 2021
Merged

Fixing serverless-wsgi to work on >=2.32 #189

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2681c82
Change to fix versions of serverless >2.32
Aug 23, 2021
cd1aa00
One more fix for data
Aug 23, 2021
ab78cff
Fixes tests
Aug 23, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 13 additions & 0 deletions index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -440,16 +440,29 @@ class ServerlessWSGI {
// no proper plugin-facing API. Instead, the current CLI options are modified
// to match those of an invoke call.
this.serverless.pluginManager.cliOptions.function = handlerFunction;
this.options.function = handlerFunction;
this.options.data = JSON.stringify({
"_serverless-wsgi": {
command: command,
data: data,
},
});
this.serverless.pluginManager.cliOptions.data = JSON.stringify({
"_serverless-wsgi": {
command: command,
data: data,
},
});

this.serverless.pluginManager.cliOptions.context = undefined;
this.serverless.pluginManager.cliOptions.f = this.serverless.pluginManager.cliOptions.function;
this.serverless.pluginManager.cliOptions.d = this.serverless.pluginManager.cliOptions.data;
this.serverless.pluginManager.cliOptions.c = this.serverless.pluginManager.cliOptions.context;
this.options.context = undefined;
this.options.f = this.options.function;
this.options.d = this.options.data;
this.options.c = this.options.context;


// The invoke plugin prints the response to the console as JSON. When invoking commands
// remotely, we get a string back and we want it to appear in the console as it would have
Expand Down
48 changes: 24 additions & 24 deletions index.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1566,13 +1566,13 @@ describe("serverless-wsgi", () => {
expect(plugin.serverless.pluginManager.cliOptions.context).to.be
.undefined;
expect(plugin.serverless.pluginManager.cliOptions.f).to.equal("app");
expect(plugin.serverless.pluginManager.cliOptions.function).to.equal(
expect(plugin.options.function).to.equal(
"app"
);
expect(plugin.serverless.pluginManager.cliOptions.d).to.equal(
'{"_serverless-wsgi":{"command":"exec","data":"print(1+4)"}}'
);
expect(plugin.serverless.pluginManager.cliOptions.data).to.equal(
expect(plugin.options.data).to.equal(
'{"_serverless-wsgi":{"command":"exec","data":"print(1+4)"}}'
);
expect(consoleSpy.calledWith("5")).to.be.true;
Expand Down Expand Up @@ -1609,13 +1609,13 @@ describe("serverless-wsgi", () => {
sandbox.stub(fse, "readFileSync").returns("print(1+4)");
plugin.hooks["wsgi:exec:exec"]().then(() => {
expect(plugin.serverless.pluginManager.cliOptions.f).to.equal("app");
expect(plugin.serverless.pluginManager.cliOptions.function).to.equal(
expect(plugin.options.function).to.equal(
"app"
);
expect(plugin.serverless.pluginManager.cliOptions.d).to.equal(
'{"_serverless-wsgi":{"command":"exec","data":"print(1+4)"}}'
);
expect(plugin.serverless.pluginManager.cliOptions.data).to.equal(
expect(plugin.options.data).to.equal(
'{"_serverless-wsgi":{"command":"exec","data":"print(1+4)"}}'
);
expect(consoleSpy.calledWith({ response: "5" })).to.be.true;
Expand Down Expand Up @@ -1702,13 +1702,13 @@ describe("serverless-wsgi", () => {
expect(plugin.serverless.pluginManager.cliOptions.context).to.be
.undefined;
expect(plugin.serverless.pluginManager.cliOptions.f).to.equal("app");
expect(plugin.serverless.pluginManager.cliOptions.function).to.equal(
expect(plugin.options.function).to.equal(
"app"
);
expect(plugin.serverless.pluginManager.cliOptions.d).to.equal(
'{"_serverless-wsgi":{"command":"exec","data":"print(1+4)"}}'
);
expect(plugin.serverless.pluginManager.cliOptions.data).to.equal(
expect(plugin.options.data).to.equal(
'{"_serverless-wsgi":{"command":"exec","data":"print(1+4)"}}'
);
expect(consoleSpy.calledWith("5")).to.be.true;
Expand Down Expand Up @@ -1745,13 +1745,13 @@ describe("serverless-wsgi", () => {
sandbox.stub(fse, "readFileSync").returns("print(1+4)");
plugin.hooks["wsgi:exec:local:exec"]().then(() => {
expect(plugin.serverless.pluginManager.cliOptions.f).to.equal("app");
expect(plugin.serverless.pluginManager.cliOptions.function).to.equal(
expect(plugin.options.function).to.equal(
"app"
);
expect(plugin.serverless.pluginManager.cliOptions.d).to.equal(
'{"_serverless-wsgi":{"command":"exec","data":"print(1+4)"}}'
);
expect(plugin.serverless.pluginManager.cliOptions.data).to.equal(
expect(plugin.options.data).to.equal(
'{"_serverless-wsgi":{"command":"exec","data":"print(1+4)"}}'
);
expect(consoleSpy.calledWith({ response: "5" })).to.be.true;
Expand Down Expand Up @@ -1831,13 +1831,13 @@ describe("serverless-wsgi", () => {
expect(plugin.serverless.pluginManager.cliOptions.context).to.be
.undefined;
expect(plugin.serverless.pluginManager.cliOptions.f).to.equal("app");
expect(plugin.serverless.pluginManager.cliOptions.function).to.equal(
expect(plugin.options.function).to.equal(
"app"
);
expect(plugin.serverless.pluginManager.cliOptions.d).to.equal(
'{"_serverless-wsgi":{"command":"command","data":"pwd"}}'
);
expect(plugin.serverless.pluginManager.cliOptions.data).to.equal(
expect(plugin.options.data).to.equal(
'{"_serverless-wsgi":{"command":"command","data":"pwd"}}'
);
expect(consoleSpy.calledWith("non-json output")).to.be.true;
Expand Down Expand Up @@ -1874,13 +1874,13 @@ describe("serverless-wsgi", () => {
sandbox.stub(fse, "readFileSync").returns("pwd");
plugin.hooks["wsgi:command:command"]().then(() => {
expect(plugin.serverless.pluginManager.cliOptions.f).to.equal("app");
expect(plugin.serverless.pluginManager.cliOptions.function).to.equal(
expect(plugin.options.function).to.equal(
"app"
);
expect(plugin.serverless.pluginManager.cliOptions.d).to.equal(
'{"_serverless-wsgi":{"command":"command","data":"pwd"}}'
);
expect(plugin.serverless.pluginManager.cliOptions.data).to.equal(
expect(plugin.options.data).to.equal(
'{"_serverless-wsgi":{"command":"command","data":"pwd"}}'
);
expect(consoleSpy.calledWith("/var/task")).to.be.true;
Expand Down Expand Up @@ -1960,13 +1960,13 @@ describe("serverless-wsgi", () => {
expect(plugin.serverless.pluginManager.cliOptions.context).to.be
.undefined;
expect(plugin.serverless.pluginManager.cliOptions.f).to.equal("app");
expect(plugin.serverless.pluginManager.cliOptions.function).to.equal(
expect(plugin.options.function).to.equal(
"app"
);
expect(plugin.serverless.pluginManager.cliOptions.d).to.equal(
'{"_serverless-wsgi":{"command":"command","data":"pwd"}}'
);
expect(plugin.serverless.pluginManager.cliOptions.data).to.equal(
expect(plugin.options.data).to.equal(
'{"_serverless-wsgi":{"command":"command","data":"pwd"}}'
);
expect(consoleSpy.calledWith("non-json output")).to.be.true;
Expand Down Expand Up @@ -2003,13 +2003,13 @@ describe("serverless-wsgi", () => {
sandbox.stub(fse, "readFileSync").returns("pwd");
plugin.hooks["wsgi:command:local:command"]().then(() => {
expect(plugin.serverless.pluginManager.cliOptions.f).to.equal("app");
expect(plugin.serverless.pluginManager.cliOptions.function).to.equal(
expect(plugin.options.function).to.equal(
"app"
);
expect(plugin.serverless.pluginManager.cliOptions.d).to.equal(
'{"_serverless-wsgi":{"command":"command","data":"pwd"}}'
);
expect(plugin.serverless.pluginManager.cliOptions.data).to.equal(
expect(plugin.options.data).to.equal(
'{"_serverless-wsgi":{"command":"command","data":"pwd"}}'
);
expect(consoleSpy.calledWith("/var/task")).to.be.true;
Expand Down Expand Up @@ -2047,13 +2047,13 @@ describe("serverless-wsgi", () => {
let consoleSpy = sandbox.spy(console, "log");
plugin.hooks["wsgi:manage:manage"]().then(() => {
expect(plugin.serverless.pluginManager.cliOptions.f).to.equal("app");
expect(plugin.serverless.pluginManager.cliOptions.function).to.equal(
expect(plugin.options.function).to.equal(
"app"
);
expect(plugin.serverless.pluginManager.cliOptions.d).to.equal(
'{"_serverless-wsgi":{"command":"manage","data":"check"}}'
);
expect(plugin.serverless.pluginManager.cliOptions.data).to.equal(
expect(plugin.options.data).to.equal(
'{"_serverless-wsgi":{"command":"manage","data":"check"}}'
);
expect(consoleSpy.calledWith("manage command output")).to.be.true;
Expand Down Expand Up @@ -2094,13 +2094,13 @@ describe("serverless-wsgi", () => {
expect(plugin.serverless.pluginManager.cliOptions.context).to.be
.undefined;
expect(plugin.serverless.pluginManager.cliOptions.f).to.equal("app");
expect(plugin.serverless.pluginManager.cliOptions.function).to.equal(
expect(plugin.options.function).to.equal(
"app"
);
expect(plugin.serverless.pluginManager.cliOptions.d).to.equal(
'{"_serverless-wsgi":{"command":"manage","data":"check"}}'
);
expect(plugin.serverless.pluginManager.cliOptions.data).to.equal(
expect(plugin.options.data).to.equal(
'{"_serverless-wsgi":{"command":"manage","data":"check"}}'
);
expect(consoleSpy.calledWith("manage command output")).to.be.true;
Expand Down Expand Up @@ -2138,13 +2138,13 @@ describe("serverless-wsgi", () => {
let consoleSpy = sandbox.spy(console, "log");
plugin.hooks["wsgi:flask:flask"]().then(() => {
expect(plugin.serverless.pluginManager.cliOptions.f).to.equal("app");
expect(plugin.serverless.pluginManager.cliOptions.function).to.equal(
expect(plugin.options.function).to.equal(
"app"
);
expect(plugin.serverless.pluginManager.cliOptions.d).to.equal(
'{"_serverless-wsgi":{"command":"flask","data":"check"}}'
);
expect(plugin.serverless.pluginManager.cliOptions.data).to.equal(
expect(plugin.options.data).to.equal(
'{"_serverless-wsgi":{"command":"flask","data":"check"}}'
);
expect(consoleSpy.calledWith("flask command output")).to.be.true;
Expand Down Expand Up @@ -2185,13 +2185,13 @@ describe("serverless-wsgi", () => {
expect(plugin.serverless.pluginManager.cliOptions.context).to.be
.undefined;
expect(plugin.serverless.pluginManager.cliOptions.f).to.equal("app");
expect(plugin.serverless.pluginManager.cliOptions.function).to.equal(
expect(plugin.options.function).to.equal(
"app"
);
expect(plugin.serverless.pluginManager.cliOptions.d).to.equal(
'{"_serverless-wsgi":{"command":"flask","data":"check"}}'
);
expect(plugin.serverless.pluginManager.cliOptions.data).to.equal(
expect(plugin.options.data).to.equal(
'{"_serverless-wsgi":{"command":"flask","data":"check"}}'
);
expect(consoleSpy.calledWith("flask command output")).to.be.true;
Expand Down