Skip to content

Commit dd442a0

Browse files
sgollapudi77sgollapudi77
committed
Merge main to current branch
1 parent 011f8b7 commit dd442a0

28 files changed

+325
-143
lines changed

‎.all-contributorsrc‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -327,6 +327,24 @@
327327
"contributions": [
328328
"doc"
329329
]
330+
},
331+
{
332+
"login": "thsackos",
333+
"name": "thsackos",
334+
"avatar_url": "https://avatars.githubusercontent.com/u/47867435?v=4",
335+
"profile": "https://github.com/thsackos",
336+
"contributions": [
337+
"code"
338+
]
339+
},
340+
{
341+
"login": "rupareddy5-21",
342+
"name": "Rupa Reddy",
343+
"avatar_url": "https://avatars.githubusercontent.com/u/85722799?v=4",
344+
"profile": "https://github.com/rupareddy5-21",
345+
"contributions": [
346+
"code"
347+
]
330348
}
331349
],
332350
"contributorsPerLine": 6,

‎.github/workflows/azuresdkdrop.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ jobs:
1212
strategy:
1313
matrix:
1414
os: [macos-latest, windows-latest, ubuntu-18.04]
15-
node-version: [12.x, 14.x, 16.x]
15+
node-version: [14.x, 16.x]
1616

1717
steps:
1818
- uses: actions/checkout@v2

‎CONTRIBUTING.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ As a contributor, here are the guidelines we would like you to follow:
88
- [Signing the CLA](#signing-the-cla)
99
- [Code of Conduct](#code-of-conduct)
1010
- [Got a Question or Problem?](#got-a-question-or-problem)
11-
- [Found an Bug?](#found-an-bug)
11+
- [Found a Bug?](#found-a-bug)
1212
- [Missing a Feature?](#missing-a-feature)
1313
- [Submission Guidelines](#submission-guidelines)
1414
- [Submitting an Issue](#submitting-an-issue)
@@ -66,7 +66,7 @@ To save your and our time, we will systematically close all issues that are requ
6666

6767
If you would like to chat about the question in real-time, you can reach out via [our Twitter][twitter].
6868

69-
## Found an Bug?
69+
## Found a Bug?
7070

7171
If you find a bug in the source code or a mistake or a typo in the documentation, you can help us by [submitting an issue][github-issues] to our [GitHub Repository][github]. Even better, you can [submit a Pull Request][github-pull-request] with a fix.
7272

‎docs/www/docs/cli/env-vars.md‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -34,19 +34,19 @@ title: Environment Variables
3434

3535
## Deploy settings
3636

37-
| Environment Variable | Purpose | Read Only? | Default Value |
38-
| ----------------------------- | ------------------------------------------------------------------------- | ---------- | ------------- |
39-
| SWA_CLI_APP_NAME | Project name | | |
40-
| SWA_CLI_DEPLOYMENT_TOKEN | Secret token used to authenticate with the Static Web Apps | | |
41-
| SWA_CLI_DEPLOY_DRY_RUN | Simulate a deploy process without actually running it (`true` or `false`) | | `false` |
42-
| SWA_CLI_DEPLOY_BINARY_VERSION | Deployment binary version to use | | `stable` |
43-
| SWA_CLI_DEPLOY_BINARY | Absoluate path to the deploy binary | Yes | |
44-
| SWA_CLI_DEPLOY_ENV | the type of deployment environment where to deploy the project | | `preview` |
45-
| AZURE_REGION_LOCATION | Azure region where to deploy the project | | `West US 2` |
46-
| AZURE_RESOURCE_GROUP | Azure resource group | | |
47-
| AZURE_SUBSCRIPTION_ID | Azure subscription ID | | |
48-
| SWA_CLI_API_LANGUAGE | Runtime Language of the function | | `node` |
49-
| SWA_CLI_API_VERSION | Version of the function runtime language | | `16` |
37+
| Environment Variable | Purpose | Read Only? | Default Value |
38+
| ----------------------------- | ---------------------------------------------------------------------------------------------------------------- | ---------- | ------------- |
39+
| SWA_CLI_APP_NAME | Project name | | |
40+
| SWA_CLI_DEPLOYMENT_TOKEN | Secret token used to authenticate with the Static Web Apps | | |
41+
| SWA_CLI_DEPLOY_DRY_RUN | Simulate a deploy process without actually running it (`true` or `false`) | | `false` |
42+
| SWA_CLI_DEPLOY_BINARY_VERSION | Deployment binary version to use | | `stable` |
43+
| SWA_CLI_DEPLOY_BINARY | Absoluate path to the deploy binary | Yes | |
44+
| SWA_CLI_DEPLOY_ENV | the type of deployment environment where to deploy the project | | `preview` |
45+
| AZURE_REGION_LOCATION | Azure region where to deploy the project. Available regions are: `westus2,centralus,eastus2,westeurope,eastasia` | | `westus2` |
46+
| AZURE_RESOURCE_GROUP | Azure resource group | | |
47+
| AZURE_SUBSCRIPTION_ID | Azure subscription ID | | |
48+
| SWA_CLI_API_LANGUAGE | Runtime Language of the function | | `node` |
49+
| SWA_CLI_API_VERSION | Version of the function runtime language | | `16` |
5050

5151
## Runtime settings
5252

‎docs/www/docs/cli/swa-config.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
---
22
sidebar_position: 8
3-
title: Configuring file
3+
title: Configuration file
44
---
55

66
## `swa-cli.config.json`
@@ -83,7 +83,7 @@ Options:
8383
- appName: <undefined>
8484
- dryRun: false
8585
- subscriptionId: <undefined>
86-
- resourceGroupName: <undefined>
86+
- resourceGroup: <undefined>
8787
- tenantId: <undefined>
8888
- clientId: <undefined>
8989
- clientSecret: <undefined>

‎docs/www/docs/cli/swa-deploy.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -171,12 +171,12 @@ Here are the options you can use with `swa deploy`:
171171
- `-pt, --print-token`: print the deployment token (default: `false`)
172172
- `--env [environment]`: the type of deployment environment where to deploy the project (default: "`preview`")
173173
- `-S, --subscription-id <subscriptionId>`: Azure subscription ID used by this project (default: `process.env.AZURE_SUBSCRIPTION_ID`)
174-
- `-R, --resource-group <resourceGroupName>`: Azure resource group used by this project
174+
- `-R, --resource-group <resourceGroup>`: Azure resource group used by this project
175175
- `-T, --tenant-id <tenantId>`: Azure tenant ID (default: `process.env.AZURE_TENANT_ID`)
176176
- `-C, --client-id <clientId>`: Azure client ID
177177
- `-CS, --client-secret <clientSecret>`: Azure client secret
178178
- `-n, --app-name <appName>`: Azure Static Web App application name
179-
- `-cc, --clear-credentials`: clear persisted credentials before login (default: `false`)
179+
- `-CC, --clear-credentials`: clear persisted credentials before login (default: `false`)
180180
- `-u, --use-keychain`: enable using the operating system native keychain for persistent credentials (default: `true`)
181181
- `-nu, --no-use-keychain`: disable using the operating system native keychain
182182
- `-h, --help`: display help for command

‎docs/www/docs/cli/swa-login.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,12 +20,12 @@ This command is used to authenticate with Azure and get a deployment token that
2020
Here are the options you can use with `swa login`:
2121

2222
- `-S, --subscription-id <subscriptionId>`: Azure subscription ID used by this project (default: `process.env.AZURE_SUBSCRIPTION_ID`)
23-
- `-R, --resource-group <resourceGroupName>`: Azure resource group used by this project
23+
- `-R, --resource-group <resourceGroup>`: Azure resource group used by this project
2424
- `-T, --tenant-id <tenantId>`: Azure tenant ID (default: `process.env.AZURE_TENANT_ID`)
2525
- `-C, --client-id <clientId>`: Azure client ID
2626
- `-CS, --client-secret <clientSecret>`: Azure client secret
2727
- `-n, --app-name <appName>`: Azure Static Web App application name
28-
- `-cc, --clear-credentials`: clear persisted credentials before login (default: `false`)
28+
- `-CC, --clear-credentials`: clear persisted credentials before login (default: `false`)
2929
- `-u, --use-keychain`: enable using the operating system native keychain for persistent credentials (default: `true`)
3030
- `-u, --no-use-keychain`: disable using the operating system native keychain
3131
- `-h, --help`: display help for command

0 commit comments

Comments
 (0)