Skip to content

Commit d0bbb93

Browse files
authored
Merge branch 'v1.16' into fix-cel-doc-ref
2 parents 7b11e71 + 9f8bfb6 commit d0bbb93

File tree

10 files changed

+70
-224
lines changed

10 files changed

+70
-224
lines changed

.github/scripts/algolia.py

Lines changed: 0 additions & 118 deletions
This file was deleted.

.github/workflows/website-root.yml

Lines changed: 0 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -61,12 +61,6 @@ jobs:
6161
output_location: "/"
6262
skip_app_build: true
6363
skip_deploy_on_missing_secrets: true
64-
- name: Upload Hugo artifacts for Algolia
65-
uses: actions/upload-artifact@v4
66-
with:
67-
name: hugo_build
68-
path: ./daprdocs/public/
69-
if-no-files-found: error
7064

7165
close_staging_site:
7266
if: github.event_name == 'pull_request' && github.event.action == 'closed'
@@ -80,29 +74,3 @@ jobs:
8074
azure_static_web_apps_api_token: ${{ secrets.AZURE_STATIC_WEB_APPS_API_TOKEN_PROUD_BAY_0E9E0E81E }}
8175
action: "close"
8276
skip_deploy_on_missing_secrets: true
83-
84-
algolia_index:
85-
name: Index site for Algolia
86-
if: github.event_name == 'push'
87-
needs: ['build_and_deploy_job']
88-
runs-on: ubuntu-latest
89-
env:
90-
ALGOLIA_APP_ID: ${{ secrets.ALGOLIA_APP_ID }}
91-
ALGOLIA_API_WRITE_KEY: ${{ secrets.ALGOLIA_API_WRITE_KEY }}
92-
ALGOLIA_INDEX_NAME: daprdocs
93-
steps:
94-
- name: Checkout docs repo
95-
uses: actions/checkout@v4
96-
with:
97-
submodules: false
98-
- name: Download Hugo artifacts for Algolia
99-
uses: actions/download-artifact@v4
100-
with:
101-
name: hugo_build
102-
path: site/
103-
- name: Install Python packages
104-
run: |
105-
pip install --upgrade bs4
106-
pip install --upgrade 'algoliasearch>=2.0,<3.0'
107-
- name: Index site
108-
run: python ./.github/scripts/algolia.py ./site

daprdocs/content/en/concepts/dapr-services/scheduler.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ When running in HA mode, you only need to expose the ports for one scheduler ins
8585
version: "3.5"
8686
services:
8787
scheduler-0:
88-
image: "docker.io/daprio/scheduler:1.16.0"
88+
image: "docker.io/daprio/scheduler:{{% dapr-latest-version %}}"
8989
command:
9090
- "./scheduler"
9191
- "--etcd-data-dir=/var/run/dapr/scheduler"
@@ -96,7 +96,7 @@ services:
9696
volumes:
9797
- ./dapr_scheduler/0:/var/run/dapr/scheduler
9898
scheduler-1:
99-
image: "docker.io/daprio/scheduler:1.16.0"
99+
image: "docker.io/daprio/scheduler:{{% dapr-latest-version %}}"
100100
command:
101101
- "./scheduler"
102102
- "--etcd-data-dir=/var/run/dapr/scheduler"
@@ -105,7 +105,7 @@ services:
105105
volumes:
106106
- ./dapr_scheduler/1:/var/run/dapr/scheduler
107107
scheduler-2:
108-
image: "docker.io/daprio/scheduler:1.16.0"
108+
image: "docker.io/daprio/scheduler:{{% dapr-latest-version %}}"
109109
command:
110110
- "./scheduler"
111111
- "--etcd-data-dir=/var/run/dapr/scheduler"

daprdocs/content/en/developing-applications/building-blocks/state-management/howto-outbox.md

Lines changed: 59 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -322,30 +322,45 @@ public class Main {
322322
public static void main(String[] args) {
323323
try (DaprClient client = new DaprClientBuilder().build()) {
324324
// Define the first state operation to save the value "2"
325-
StateOperation<String> op1 = new StateOperation<>(
326-
StateOperationType.UPSERT,
325+
State<String> state1 = new State<>(
327326
"key1",
328-
"2"
327+
"2",
328+
null, // etag
329+
null // concurrency and consistency options
329330
);
330331
331332
// Define the second state operation to publish the value "3" with metadata
332333
Map<String, String> metadata = new HashMap<>();
333334
metadata.put("outbox.projection", "true");
334335
335-
StateOperation<String> op2 = new StateOperation<>(
336-
StateOperationType.UPSERT,
336+
State<String> state2 = new State<>(
337337
"key1",
338338
"3",
339-
metadata
339+
null, // etag
340+
metadata,
341+
null // concurrency and consistency options
342+
);
343+
344+
TransactionalStateOperation<String> op1 = new TransactionalStateOperation<>(
345+
TransactionalStateOperation.OperationType.UPSERT, state1
346+
);
347+
348+
TransactionalStateOperation<String> op2 = new TransactionalStateOperation<>(
349+
TransactionalStateOperation.OperationType.UPSERT, state2
340350
);
341351
342-
// Create the list of state operations
343-
List<StateOperation<?>> ops = new ArrayList<>();
352+
// Create the list of transaction state operations
353+
List<TransactionalStateOperation<?>> ops = new ArrayList<>();
344354
ops.add(op1);
345355
ops.add(op2);
346356
357+
// Configure transaction request setting the state store
358+
ExecuteStateTransactionRequest transactionRequest = new ExecuteStateTransactionRequest(DAPR_STORE_NAME);
359+
360+
transactionRequest.setOperations(ops);
361+
347362
// Execute the state transaction
348-
client.executeStateTransaction(DAPR_STORE_NAME, ops).block();
363+
client.executeStateTransaction(transactionRequest).block();
349364
System.out.println("State transaction executed.");
350365
} catch (Exception e) {
351366
e.printStackTrace();
@@ -595,39 +610,42 @@ public class StateOperationExample {
595610
executeStateTransaction();
596611
}
597612
598-
public static void executeStateTransaction() {
599-
// Build Dapr client
600-
try (DaprClient daprClient = new DaprClientBuilder().build()) {
601-
602-
// Define the value "2"
603-
String value = "2";
604-
605-
// Override CloudEvent metadata
606-
Map<String, String> metadata = new HashMap<>();
607-
metadata.put("cloudevent.id", "unique-business-process-id");
608-
metadata.put("cloudevent.source", "CustomersApp");
609-
metadata.put("cloudevent.type", "CustomerCreated");
610-
metadata.put("cloudevent.subject", "123");
611-
metadata.put("my-custom-ce-field", "abc");
612-
613-
// Define state operations
614-
List<StateOperation<?>> ops = new ArrayList<>();
615-
StateOperation<String> op1 = new StateOperation<>(
616-
StateOperationType.UPSERT,
617-
"key1",
618-
value,
619-
metadata
620-
);
621-
ops.add(op1);
622-
623-
// Execute state transaction
624-
String storeName = "your-state-store-name";
625-
daprClient.executeStateTransaction(storeName, ops).block();
626-
System.out.println("State transaction executed.");
627-
} catch (Exception e) {
628-
e.printStackTrace();
629-
}
613+
public static void executeStateTransaction() {
614+
// Build Dapr client
615+
try (DaprClient daprClient = new DaprClientBuilder().build()) {
616+
617+
// Override CloudEvent metadata
618+
Map<String, String> metadata = new HashMap<>();
619+
metadata.put("cloudevent.id", "unique-business-process-id");
620+
metadata.put("cloudevent.source", "CustomersApp");
621+
metadata.put("cloudevent.type", "CustomerCreated");
622+
metadata.put("cloudevent.subject", "123");
623+
metadata.put("my-custom-ce-field", "abc");
624+
625+
State<String> state = new State<>(
626+
"key1", // Define the key "key1"
627+
"value1", // Define the value "value1"
628+
null, // etag
629+
metadata,
630+
null // concurrency and consistency options
631+
);
632+
633+
// Define state operations
634+
List<TransactionalStateOperation<?>> ops = new ArrayList<>();
635+
TransactionalStateOperation<String> op1 = new TransactionalStateOperation<>(
636+
TransactionalStateOperation.OperationType.UPSERT,
637+
state
638+
);
639+
ops.add(op1);
640+
641+
// Execute state transaction
642+
String storeName = "your-state-store-name";
643+
daprClient.executeStateTransaction(storeName, ops).block();
644+
System.out.println("State transaction executed.");
645+
} catch (Exception e) {
646+
e.printStackTrace();
630647
}
648+
}
631649
}
632650
```
633651
{{% /tab %}}

daprdocs/content/en/operations/configuration/secret-scope.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ title: "How-To: Limit the secrets that can be read from secret stores"
44
linkTitle: "Limit secret store access"
55
weight: 3000
66
description: "Define secret scopes by augmenting the existing configuration resource with restrictive permissions."
7-
description: "Define secret scopes by augmenting the existing configuration resource with restrictive permissions."
87
---
98

109
In addition to [scoping which applications can access a given component]({{% ref "component-scopes.md"%}}), you can also scope a named secret store component to one or more secrets for an application. By defining `allowedSecrets` and/or `deniedSecrets` lists, you restrict applications to access only specific secrets.

daprdocs/content/en/operations/support/support-release-policy.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,7 @@ The table below shows the versions of Dapr releases that have been tested togeth
4545

4646
| Release date | Runtime | CLI | SDKs | Dashboard | Status | Release notes |
4747
|--------------------|:--------:|:--------|---------|---------|---------|------------|
48+
| Oct 30th 2025 | 1.16.2</br> | 1.16.3 | Java 1.16.0 </br>Go 1.13.0 </br>PHP 1.2.0 </br>Python 1.16.0 </br>.NET 1.16.0 </br>JS 3.6.0 </br>Rust 0.17.0 | 0.15.0 | Supported (current) | [v1.16.2 release notes](https://github.com/dapr/dapr/releases/tag/v1.16.2) |
4849
| Oct 6th 2025 | 1.16.1</br> | 1.16.1 | Java 1.16.0 </br>Go 1.13.0 </br>PHP 1.2.0 </br>Python 1.16.0 </br>.NET 1.16.0 </br>JS 3.6.0 </br>Rust 0.17.0 | 0.15.0 | Supported (current) | [v1.16.1 release notes](https://github.com/dapr/dapr/releases/tag/v1.16.1) |
4950
| Sep 16th 2025 | 1.16.0</br> | 1.16.0 | Java 1.16.0 </br>Go 1.13.0 </br>PHP 1.2.0 </br>Python 1.16.0 </br>.NET 1.16.0 </br>JS 3.6.0 </br>Rust 0.17.0 | 0.15.0 | Supported (current) | [v1.16.0 release notes](https://github.com/dapr/dapr/releases/tag/v1.16.0) |
5051
| Sep 17th 2025 | 1.15.12</br> | 1.15.0 | Java 1.14.2, 1.15.0 </br>Go 1.12.0 </br>PHP 1.2.0 </br>Python 1.15.0 </br>.NET 1.15.4 </br>JS 3.5.2 </br>Rust 0.16.1 | 0.15.0 | Supported | [v1.15.12 release notes](https://github.com/dapr/dapr/releases/tag/v1.15.12) |

daprdocs/layouts/_partials/hooks/body-end.html

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@
55
<script type="text/javascript">
66
docsearch({
77
container: '#docsearch',
8-
appId: 'O0QLQGNF38',
9-
apiKey: '54ae43aa28ce8f00c54c8d5f544d29b9',
10-
indexName: 'crawler_dapr',
8+
appId: '{{ .appId }}',
9+
apiKey: '{{ .apiKey }}',
10+
indexName: '{{ .indexName }}',
1111
});
1212
</script>
1313

Lines changed: 0 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,3 @@
11
{{ with .Site.Params.search.algolia }}
22
<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/@docsearch/css@3" />
3-
4-
<script
5-
async
6-
src="https://widget.kapa.ai/kapa-widget.bundle.js"
7-
data-website-id="8e5bac24-7723-4b77-9b1b-99d6e058a864"
8-
data-project-name="Dapr Docs AI"
9-
data-modal-title="Dapr Docs AI assistant"
10-
data-project-color="#ff4e00"
11-
data-project-logo="https://cdn.prod.website-files.com/66965adecd57031ed9ad181e/689f979646c1922bbc244a8b_dapr-ai-icon-transparent.png"
12-
data-modal-open-by-default="false"
13-
data-modal-disclaimer="Answers are based on the Dapr docs, relevant websites, and GitHub repositories. Always double check the results and please provide feedback with a 👍 or 👎 so we continue to improve this service."
14-
data-modal-example-questions="How do I get started with Dapr?, How do I use Kafka with Dapr Pub/Sub?, How do I run Dapr in production?, How do I build agentic AI with Dapr?"
15-
data-modal-example-questions-title="Try asking:"
16-
data-modal-ask-ai-input-placeholder="Ask me anything Dapr-related..."
17-
data-answer-cta-button-enabled="true"
18-
data-answer-cta-button-link="https://bit.ly/dapr-discord"
19-
data-answer-cta-button-text="Join us on Discord"
20-
data-modal-header-bg-color="#0D2192"
21-
data-modal-title-color="#FFFFFF"
22-
data-modal-image-height="32"
23-
data-modal-image-width="32"
24-
></script>
253
{{ end }}
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
{{- if .Get "short" }}1.16{{ else if .Get "long" }}1.16.0{{ else if .Get "cli" }}1.16.0{{ else }}1.16.0{{ end -}}
1+
{{- if .Get "short" }}1.16{{ else if .Get "long" }}1.16.2{{ else if .Get "cli" }}1.16.3{{ else }}1.16.2{{ end -}}

hugo.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -188,9 +188,9 @@ params:
188188

189189
search:
190190
algolia:
191-
appId: 'O0QLQGNF38'
192-
apiKey: '54ae43aa28ce8f00c54c8d5f544d29b9'
193-
indexName: daprdocs
191+
appId: O0QLQGNF38
192+
apiKey: 54ae43aa28ce8f00c54c8d5f544d29b9
193+
indexName: crawler_dapr
194194
offlineSearch: false
195195

196196
# User interface configuration

0 commit comments

Comments
 (0)