Skip to content
This repository was archived by the owner on Dec 9, 2024. It is now read-only.

Commit 25bf717

Browse files
tbarlow12mydiemhowbrezadependabot[bot]ofekray
authored
ci: Merge master back into dev (#440)
* feat: ConfigService for centralizing configuration and simplifying BaseService (#338) `ConfigService` and its usage. This removes the configuration logic from `BaseService` and keeps it all in one place. Also adds some constants for default configuration. * release: Update prerelease version to 1.0.2-0 ***NO_CI*** * fix: Sync triggers on external package deployment (#339) Fix updating of function app settings (SDK call wasn't working) and syncing triggers for function apps running from external package. * release: Update prerelease version to 1.0.2-1 ***NO_CI*** * ci: fix failing Node 8 builds on windows agent (#345) Hosted agent roll out a fix that broke our builds: 1. Previously, npm wasn’t getting packaged with the version of node in the tool cache, ie. npm 5.6.0 should be used alongside Node 8.10.0. 1. The fix is to pin to a later version of Node 8 (e.g. 8.16.1) which comes with npm 6+ - https://nodejs.org/en/download/releases/. * This will probably slow the build down a little bit since the agent will have to download the version (instead of it being pre-installed), but we'll get the right version of npm for free. * fix job name * fix job name restrictiosn * still trying to get the right job name format * clean up job name * release: Update prerelease version to 1.0.2-2 ***NO_CI*** * release: Update prerelease version to 1.0.2-3 ***NO_CI*** * fix: Fix typing errors in ARM params and add interfaces (#347) * release: Update prerelease version to 1.0.2-4 ***NO_CI*** * fix: Update to support CosmosDB bindings (#350) Updatings the binding schema that is generated to support the changes made to Cosmos DB * release: Update prerelease version to 1.0.2-5 ***NO_CI*** * feat: Refactor runtime configuration to allow for non-node runtimes (#348) - Added `FunctionRuntime` configuration to provider - Extracting `FunctionRuntime` from `runtime` property of configuration within `ConfigService` - Refactored node-specific code in ARM template generation * release: Update prerelease version to 1.0.2-6 ***NO_CI*** * fix: Update GitHub Issue and PR templates (#353) * release: Update prerelease version to 1.0.2-7 ***NO_CI*** * fix: Sort deployments in descending order and fix APIM arm template (#354) - Updated parameter name in APIM arm template - Fixed bug of sorting deployments in ascending order, when it should have been descending. This would have pretty serious consequences, because it means that the comparison of ARM templates would always be targeting the first ever deployment, not the most recent. - Because the `sort()` function sorts the array in place, this bug was not being detected by the tests. Updated `resourceService` tests to create copies of the array rather than using the original reference when testing the validity of the result. * release: Update prerelease version to 1.0.2-8 ***NO_CI*** * release: Update patch version to 1.0.2 ***NO_CI*** * ci: Add GitHub workflow to move new issues to "To triage" column (#381) * build(deps): bump handlebars from 4.1.2 to 4.5.3 (#400) Bumps [handlebars](https://github.com/wycats/handlebars.js) from 4.1.2 to 4.5.3. - [Release notes](https://github.com/wycats/handlebars.js/releases) - [Changelog](https://github.com/wycats/handlebars.js/blob/master/release-notes.md) - [Commits](handlebars-lang/handlebars.js@v4.1.2...v4.5.3) Signed-off-by: dependabot[bot] <[email protected]> * Fix displayName for cosmosDBTrigger (#399) * Update bindings.json Co-authored-by: [email protected] <Serverless Azure Functions> Co-authored-by: My <[email protected]> Co-authored-by: Wallace Breza <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Ofek Bashan <[email protected]>
1 parent 9473fb6 commit 25bf717

File tree

6 files changed

+954
-1626
lines changed

6 files changed

+954
-1626
lines changed

.github/workflows/main.yml

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
name: "Add new issues to 'To triage' column"
2+
on:
3+
issues:
4+
types: [opened]
5+
jobs:
6+
Add_New_Issue_To_Project:
7+
runs-on: ubuntu-latest
8+
steps:
9+
- uses: konradpabjan/[email protected]
10+
with:
11+
action-token: "${{ secrets.ACCESS_TOKEN }}"
12+
project-url: "https://github.com/serverless/serverless-azure-functions/projects/1"
13+
column-name: "To triage"

package-lock.json

Lines changed: 14 additions & 7 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/armTemplates/resources/appServicePlan.ts

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,12 @@ interface AppServicePlanParams extends DefaultArmParams {
1616
appServicePlanReserved: ArmParameter;
1717
}
1818

19+
interface AppServicePlanParams extends DefaultArmParams {
20+
appServicePlanName: ArmParameter;
21+
appServicePlanSkuName: ArmParameter;
22+
appServicePlanSkuTier: ArmParameter;
23+
}
24+
1925
export class AppServicePlanResource implements ArmResourceTemplateGenerator {
2026
public static getResourceName(config: ServerlessAzureConfig) {
2127
const options: AzureNamingServiceOptions = {

src/services/configService.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -150,7 +150,6 @@ export class ConfigService {
150150
if (!providerRegion || providerRegion === awsRegion) {
151151
config.provider.region = this.serverless.service.provider["location"] || region;
152152
}
153-
154153
if (!config.provider.stage) {
155154
config.provider.stage = stage;
156155
}

0 commit comments

Comments
 (0)