diff --git a/.github/workflows/website-root.yml b/.github/workflows/website-root.yml deleted file mode 100644 index 10277109f..000000000 --- a/.github/workflows/website-root.yml +++ /dev/null @@ -1,53 +0,0 @@ -name: Azure Static Web App Root - -on: - push: - branches: - - v1.4 - pull_request: - types: [opened, synchronize, reopened, closed] - branches: - - v1.4 - -jobs: - build_and_deploy_job: - if: github.event_name == 'push' || (github.event_name == 'pull_request' && github.event.action != 'closed') - runs-on: ubuntu-latest - name: Build and Deploy Job - steps: - - uses: actions/checkout@v2 - with: - submodules: recursive - - name: Setup Docsy - run: cd daprdocs && git submodule update --init --recursive && sudo npm install -D --save autoprefixer && sudo npm install -D --save postcss-cli - - name: Build And Deploy - id: builddeploy - uses: Azure/static-web-apps-deploy@v0.0.1-preview - env: - HUGO_ENV: production - HUGO_VERSION: "0.74.3" - with: - azure_static_web_apps_api_token: ${{ secrets.AZURE_STATIC_WEB_APPS_API_TOKEN_PROUD_BAY_0E9E0E81E }} - repo_token: ${{ secrets.GITHUB_TOKEN }} # Used for Github integrations (i.e. PR comments) - skip_deploy_on_missing_secrets: true - action: "upload" - ###### Repository/Build Configurations - These values can be configured to match your app requirements. ###### - # For more information regarding Static Web App workflow configurations, please visit: https://aka.ms/swaworkflowconfig - app_location: "/daprdocs" # App source code path - api_location: "api" # Api source code path - optional - output_location: "public" # Built app content directory - optional - app_build_command: "hugo" - ###### End of Repository/Build Configurations ###### - - close_pull_request_job: - if: github.event_name == 'pull_request' && github.event.action == 'closed' - runs-on: ubuntu-latest - name: Close Pull Request Job - steps: - - name: Close Pull Request - id: closepullrequest - uses: Azure/static-web-apps-deploy@v0.0.1-preview - with: - azure_static_web_apps_api_token: ${{ secrets.AZURE_STATIC_WEB_APPS_API_TOKEN_PROUD_BAY_0E9E0E81E }} - skip_deploy_on_missing_secrets: true - action: "close" \ No newline at end of file diff --git a/README.md b/README.md index 4997d48e5..7b24f2a56 100644 --- a/README.md +++ b/README.md @@ -14,8 +14,8 @@ The following branches are currently maintained: | Branch | Website | Description | | ------------------------------------------------------------ | -------------------------- | ------------------------------------------------------------------------------------------------ | -| [v1.4](https://github.com/dapr/docs) (primary) | https://docs.dapr.io | Latest Dapr release documentation. Typo fixes, clarifications, and most documentation goes here. | -| [v1.5](https://github.com/dapr/docs/tree/v1.5) (pre-release) | https://v1-5.docs.dapr.io/ | Pre-release documentation. Doc updates that are only applicable to v1.5+ go here. | +| [v1.5](https://github.com/dapr/docs) (primary) | https://docs.dapr.io | Latest Dapr release documentation. Typo fixes, clarifications, and most documentation goes here. | +| [v1.6](https://github.com/dapr/docs/tree/v1.6) (pre-release) | https://v1-6.docs.dapr.io/ | Pre-release documentation. Doc updates that are only applicable to v1.6+ go here. | For more information visit the [Dapr branch structure](https://docs.dapr.io/contributing/contributing-docs/#branch-guidance) document. diff --git a/daprdocs/config.toml b/daprdocs/config.toml index 15ccbbc35..84a8d59b5 100644 --- a/daprdocs/config.toml +++ b/daprdocs/config.toml @@ -1,5 +1,5 @@ # Site Configuration -baseURL = "https://docs.dapr.io/" +baseURL = "https://v1-4.docs.dapr.io/" title = "Dapr Docs" theme = "docsy" disableFastRender = true @@ -160,17 +160,20 @@ github_subdir = "daprdocs" github_branch = "v1.4" # Versioning -version_menu = "v1.4 (latest)" +version_menu = "v1.4" version = "v1.4" -archived_version = false +archived_version = true url_latest_version = "https://docs.dapr.io" [[params.versions]] - version = "v1.5 (preview)" - url = "https://v1-5.docs.dapr.io" + version = "v1.6 (preview)" + url = "https://v1-6.docs.dapr.io" [[params.versions]] - version = "v1.4 (latest)" - url = "#" + version = "v1.5 (latest)" + url = "https://docs.dapr.io" +[[params.versions]] + version = "v1.4" + url = "https://v1-4.docs.dapr.io" [[params.versions]] version = "v1.3" url = "https://v1-3.docs.dapr.io" diff --git a/daprdocs/content/en/operations/support/support-release-policy.md b/daprdocs/content/en/operations/support/support-release-policy.md index 31cb1033b..d2f6acf91 100644 --- a/daprdocs/content/en/operations/support/support-release-policy.md +++ b/daprdocs/content/en/operations/support/support-release-policy.md @@ -47,6 +47,7 @@ The table below shows the versions of Dapr releases that have been tested togeth | Oct 7th 2021 | 1.4.3
| 1.4.0 | Java 1.3.0
Go 1.3.0
PHP 1.2.0
Python 1.3.0
.NET 1.4.0 | 0.8.0 | Supported (current) | | December 6th 2021 | 1.4.4
| 1.4.0 | Java 1.3.0
Go 1.3.0
PHP 1.2.0
Python 1.3.0
.NET 1.4.0 | 0.8.0 | Supported (current) | + ## Upgrade paths After the 1.0 release of the runtime there may be situations where it is necessary to explicitly upgrade through an additional release to reach the desired target. For example an upgrade from v1.0 to v1.2 may need go pass through v1.1 @@ -70,6 +71,7 @@ General guidance on upgrading can be found for [self hosted mode]({{}}) | ✅ | ✅ | Alpha | v1 | 1.2 | | [Alibaba Cloud OSS]({{< ref alicloudoss.md >}}) | | ✅ | Alpha | v1 | 1.0 | -| [Alibaba Cloud Tablestore]({{< ref alicloudtablestore.md >}}) | | ✅ | Alpha | v1 | 1.4 | ### Amazon Web Services (AWS) diff --git a/daprdocs/content/en/reference/components-reference/supported-bindings/alicloudtablestore.md b/daprdocs/content/en/reference/components-reference/supported-bindings/alicloudtablestore.md deleted file mode 100644 index 754e1195c..000000000 --- a/daprdocs/content/en/reference/components-reference/supported-bindings/alicloudtablestore.md +++ /dev/null @@ -1,143 +0,0 @@ ---- -type: docs -title: "Alibaba Cloud Tablestore binding spec" -linkTitle: "Alibaba Cloud Tablestore" -description: "Detailed documentation on the Alibaba Tablestore binding component" -aliases: - - "/operations/components/setup-bindings/supported-bindings/alicloudtablestore/" ---- - -## Component format - -To setup an Alibaba Cloud Tablestore binding create a component of type `bindings.alicloud.tablestore`. See [this guide]({{< ref "howto-bindings.md#1-create-a-binding" >}}) on how to create and apply a secretstore configuration. See this guide on [referencing secrets]({{< ref component-secrets.md >}}) to retrieve and use the secret with Dapr components. - -```yaml -apiVersion: dapr.io/v1alpha1 -kind: Component -metadata: - name: mytablestore - namespace: default -spec: - type: bindings.alicloud.tablestore - version: v1 - metadata: - - name: endpoint - value: "[endpoint]" - - name: accessKeyID - value: "[key-id]" - - name: accessKey - value: "[access-key]" - - name: instanceName - value: "[instance]" - - name: tableName - value: "[table]" - - name: endpoint - value: "[endpoint]" -``` - -{{% alert title="Warning" color="warning" %}} -The above example uses secrets as plain strings. It is recommended to use a secret store for the secrets as described [here]({{< ref component-secrets.md >}}). -{{% /alert %}} - -## Spec metadata fields - -| Field | Required | Binding support | Details | Example | -|---------------|----------|---------|---------|---------| -| `endpoint` | Y | Output | Alicloud Tablestore endpoint. | https://tablestore-cn-hangzhou.aliyuncs.com -| `accessKeyID` | Y | Output | Access key ID credential. | -| `accessKey` | Y | Output | Access key credential. | -| `instanceName` | Y | Output | Name of the instance. | -| `tableName` | Y | Output | Name of the table. | - -## Binding support - -This component supports **output binding** with the following operations: -- `create`: [Create object](#create-object) - - -### Create object - -To perform a create object operation, invoke the binding with a `POST` method and the following JSON body: - -```json -{ - "operation": "create", - "data": "YOUR_CONTENT", - "metadata": { - "primaryKeys": "pk1" - } -} -``` - -{{% alert title="Note" color="primary" %}} -Note the `metadata.primaryKeys` field is mandatory. -{{% /alert %}} - -### Delete object - -To perform a delete object operation, invoke the binding with a `POST` method and the following JSON body: - -```json -{ - "operation": "delete", - "metadata": { - "primaryKeys": "pk1", - "columnToGet": "name,age,date" - }, - "data": { - "pk1": "data1" - } -} -``` - -{{% alert title="Note" color="primary" %}} -Note the `metadata.primaryKeys` field is mandatory. -{{% /alert %}} - -### List objects - -To perform a list objects operation, invoke the binding with a `POST` method and the following JSON body: - -```json -{ - "operation": "delete", - "metadata": { - "primaryKeys": "pk1", - "columnToGet": "name,age,date" - }, - "data": { - "pk1": "data1", - "pk2": "data2" - } -} -``` - -{{% alert title="Note" color="primary" %}} -Note the `metadata.primaryKeys` field is mandatory. -{{% /alert %}} - -### Get object - -To perform a get object operation, invoke the binding with a `POST` method and the following JSON body: - -```json -{ - "operation": "delete", - "metadata": { - "primaryKeys": "pk1" - }, - "data": { - "pk1": "data1" - } -} -``` - -{{% alert title="Note" color="primary" %}} -Note the `metadata.primaryKeys` field is mandatory. -{{% /alert %}} - -## Related links - -- [Bindings building block]({{< ref bindings >}}) -- [How-To: Use bindings to interface with external resources]({{< ref howto-bindings.md >}}) -- [Bindings API reference]({{< ref bindings_api.md >}}) diff --git a/daprdocs/layouts/partials/navbar.html b/daprdocs/layouts/partials/navbar.html index e1dc682d4..5a2bc8fd6 100644 --- a/daprdocs/layouts/partials/navbar.html +++ b/daprdocs/layouts/partials/navbar.html @@ -14,7 +14,7 @@ {{ end }} {{ $url := urls.Parse .URL }} {{ $baseurl := urls.Parse $.Site.Params.Baseurl }} - {{ .Name }} + {{ .Name }} {{ end }} {{ if .Site.Params.versions }} diff --git a/daprdocs/layouts/partials/page-meta-links.html b/daprdocs/layouts/partials/page-meta-links.html index bd55efdf3..6bf0d95a1 100644 --- a/daprdocs/layouts/partials/page-meta-links.html +++ b/daprdocs/layouts/partials/page-meta-links.html @@ -21,8 +21,8 @@ {{ $newPageQS := querify "value" $newPageStub.Content "filename" "change-me.md" | safeURL }} {{ $newPageURL := printf "%s/new/%s?%s" $gh_repo $gh_repo_path $newPageQS }} - {{ T "post_edit_this" }} - {{ T "post_create_issue" }} + {{ T "post_edit_this" }} + {{ T "post_create_issue" }} {{ end }} {{ end }} diff --git a/daprdocs/layouts/partials/version-banner.html b/daprdocs/layouts/partials/version-banner.html index 0436da130..09b705b07 100644 --- a/daprdocs/layouts/partials/version-banner.html +++ b/daprdocs/layouts/partials/version-banner.html @@ -8,7 +8,7 @@ {{ with $current_version }}

The documentation you are viewing is for Dapr {{ . | markdownify }} which is an older version of Dapr. {{ with $latest_version }}For up-to-date documentation, see the - latest version.

+ latest version.

{{ end }} {{ end }}