Skip to content
This repository was archived by the owner on Dec 9, 2024. It is now read-only.
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
7 changes: 6 additions & 1 deletion src/plugins/login/azureLoginPlugin.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ import { AzureLoginService } from "../../services/loginService";
import { MockFactory } from "../../test/mockFactory";
import { invokeHook, setEnvVariables, unsetEnvVariables } from "../../test/utils";
import { AzureLoginPlugin } from "./azureLoginPlugin";
import { loginHooks } from "./loginHooks";

describe("Login Plugin", () => {

Expand Down Expand Up @@ -32,14 +33,18 @@ describe("Login Plugin", () => {

async function invokeLoginHook(hasCreds = false, serverless?: Serverless, options?: Serverless.Options) {
const plugin = createPlugin(hasCreds, serverless, options);
await invokeHook(plugin, "before:deploy:deploy");
await invokeHook(plugin, `before:${loginHooks[0]}`);
}

beforeEach(() => {
AzureLoginService.interactiveLogin = createMockLoginFunction();
AzureLoginService.servicePrincipalLogin = createMockLoginFunction();
});

it("contains the hooks as contained in loginHooks", () => {
expect(Object.keys(createPlugin().hooks)).toEqual(loginHooks.map((hook) => `before:${hook}`));
});

it("returns if azure credentials are set", async () => {
await invokeLoginHook(true);
expect(AzureLoginService.interactiveLogin).not.toBeCalled();
Expand Down
17 changes: 6 additions & 11 deletions src/plugins/login/azureLoginPlugin.ts
Original file line number Diff line number Diff line change
@@ -1,23 +1,18 @@
import Serverless from "serverless";
import AzureProvider from "../../provider/azureProvider";
import { AzureLoginService } from "../../services/loginService";
import { AzureLoginOptions, AzureLoginService } from "../../services/loginService";
import { AzureBasePlugin } from "../azureBasePlugin";
import { AzureLoginOptions } from "../../services/loginService";
import { loginHooks } from "./loginHooks";

export class AzureLoginPlugin extends AzureBasePlugin<AzureLoginOptions> {
private provider: AzureProvider;
public hooks: { [eventName: string]: Promise<any> };

public constructor(serverless: Serverless, options: AzureLoginOptions) {
super(serverless, options);
this.provider = (this.serverless.getProvider("azure") as any) as AzureProvider;

this.hooks = {
"before:deploy:deploy": this.login.bind(this),
"before:deploy:list:list": this.login.bind(this),
"before:invoke:invoke": this.login.bind(this),
"before:rollback:rollback": this.login.bind(this),
};
this.hooks = {};
for (const h of loginHooks) {
this.hooks[`before:${h}`] = this.login.bind(this);
}
}

private async login() {
Expand Down
11 changes: 11 additions & 0 deletions src/plugins/login/loginHooks.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
/**
* Hooks that require authentication before execution
*/
export const loginHooks = [
"package:initialize",
"deploy:list:list",
"deploy:deploy",
"invoke:invoke",
"rollback:rollback",
"remove:remove",
]