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
12 changes: 11 additions & 1 deletion src/plugins/login/azureLoginPlugin.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ describe("Login Plugin", () => {
expect(AzureLoginService.interactiveLogin).toBeCalled()
expect(sls.variables["subscriptionId"]).toEqual("test-subs-id");
expect(sls.cli.log).toBeCalledWith("Using subscription ID: test-subs-id");
})
});

it("Uses the default subscription ID" , async () => {
const sls = MockFactory.createTestServerless();
Expand All @@ -110,4 +110,14 @@ describe("Login Plugin", () => {
expect(sls.variables["subscriptionId"]).toEqual("azureSubId");
expect(sls.cli.log).toBeCalledWith("Using subscription ID: azureSubId");
});

it("Uses the subscription ID specified in serverless yaml", async () => {
const sls = MockFactory.createTestServerless();
const opt = MockFactory.createTestServerlessOptions();
sls.service.provider["subscriptionId"] = "test-subs-id";
await invokeLoginHook(false, sls, opt);
expect(AzureLoginService.interactiveLogin).toBeCalled()
expect(sls.variables["subscriptionId"]).toEqual("test-subs-id");
expect(sls.cli.log).toBeCalledWith("Using subscription ID: test-subs-id");
});
});
2 changes: 1 addition & 1 deletion src/plugins/login/azureLoginPlugin.ts
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ export class AzureLoginPlugin extends AzureBasePlugin<AzureLoginOptions> {
this.serverless.variables["azureCredentials"] = authResult.credentials;
// Use environment variable for sub ID or use the first subscription in the list (service principal can
// have access to more than one subscription)
this.serverless.variables["subscriptionId"] = this.options.subscriptionId || process.env.azureSubId || authResult.subscriptions[0].id;
this.serverless.variables["subscriptionId"] = this.options.subscriptionId || process.env.azureSubId || this.serverless.service.provider["subscriptionId"] || authResult.subscriptions[0].id;
this.serverless.cli.log(`Using subscription ID: ${this.serverless.variables["subscriptionId"]}`);
}
catch (e) {
Expand Down