Skip to content

Commit 38c8f10

Browse files
pravinpushkarpravinpushkar
authored
update dapr to 1.10.0-rc.2 (#1201)
* rc.2 changes Signed-off-by: Pravin Pushkar <ppushkar@microsoft.com> * added test for obfuscation Signed-off-by: Pravin Pushkar <ppushkar@microsoft.com> --------- Signed-off-by: Pravin Pushkar <ppushkar@microsoft.com>
1 parent 50d5af4 commit 38c8f10

File tree

8 files changed

+48
-16
lines changed

8 files changed

+48
-16
lines changed

‎.github/workflows/kind_e2e.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,11 +51,11 @@ jobs:
5151
runs-on: ubuntu-latest
5252
env:
5353
GOVER: 1.19.3
54-
DAPR_RUNTIME_PINNED_VERSION: 1.10.0-rc.1
54+
DAPR_RUNTIME_PINNED_VERSION: 1.10.0-rc.2
5555
DAPR_DASHBOARD_PINNED_VERSION: 0.11.0
5656
DAPR_RUNTIME_LATEST_VERSION:
5757
DAPR_DASHBOARD_LATEST_VERSION:
58-
DAPR_TGZ: dapr-1.10.0-rc.1.tgz
58+
DAPR_TGZ: dapr-1.10.0-rc.2.tgz
5959
strategy:
6060
fail-fast: false # Keep running if one leg fails.
6161
matrix:

‎.github/workflows/self_hosted_e2e.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ jobs:
4040
GOARCH: ${{ matrix.target_arch }}
4141
GOPROXY: https://proxy.golang.org
4242
ARCHIVE_OUTDIR: dist/archives
43-
DAPR_RUNTIME_PINNED_VERSION: "1.10.0-rc.1"
43+
DAPR_RUNTIME_PINNED_VERSION: "1.10.0-rc.2"
4444
DAPR_DASHBOARD_PINNED_VERSION: 0.11.0
4545
DAPR_RUNTIME_LATEST_VERSION:
4646
DAPR_DASHBOARD_LATEST_VERSION:

‎go.mod‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ require (
77
github.com/Azure/go-autorest/autorest/adal v0.9.22 // indirect
88
github.com/Pallinder/sillyname-go v0.0.0-20130730142914-97aeae9e6ba1
99
github.com/briandowns/spinner v1.19.0
10-
github.com/dapr/dapr v1.10.0-rc.1
10+
github.com/dapr/dapr v1.10.0-rc.2
1111
github.com/dapr/go-sdk v1.6.0
1212
github.com/docker/docker v20.10.20+incompatible
1313
github.com/fatih/color v1.13.0
@@ -67,7 +67,7 @@ require (
6767
github.com/containerd/containerd v1.6.6 // indirect
6868
github.com/containerd/continuity v0.2.2 // indirect
6969
github.com/cyphar/filepath-securejoin v0.2.3 // indirect
70-
github.com/dapr/components-contrib v1.10.0-rc.1 // indirect
70+
github.com/dapr/components-contrib v1.10.0-rc.2 // indirect
7171
github.com/dapr/kit v0.0.4 // indirect
7272
github.com/davecgh/go-spew v1.1.1 // indirect
7373
github.com/docker/cli v20.10.17+incompatible // indirect

‎go.sum‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -330,10 +330,10 @@ github.com/d2g/dhcp4client v1.0.0/go.mod h1:j0hNfjhrt2SxUOw55nL0ATM/z4Yt3t2Kd1mW
330330
github.com/d2g/dhcp4server v0.0.0-20181031114812-7d4a0a7f59a5/go.mod h1:Eo87+Kg/IX2hfWJfwxMzLyuSZyxSoAug2nGa1G2QAi8=
331331
github.com/d2g/hardwareaddr v0.0.0-20190221164911-e7d9fbe030e4/go.mod h1:bMl4RjIciD2oAxI7DmWRx6gbeqrkoLqv3MV0vzNad+I=
332332
github.com/danieljoos/wincred v1.1.0/go.mod h1:XYlo+eRTsVA9aHGp7NGjFkPla4m+DCL7hqDjlFjiygg=
333-
github.com/dapr/components-contrib v1.10.0-rc.1 h1:ZkUzIe+D4HcDVu06c5FPfNdJvmrt1Xl6i8BNkQfYkos=
334-
github.com/dapr/components-contrib v1.10.0-rc.1/go.mod h1:8OvVS4m3kK/ocDqhVYKdu4j7OS4gPlbXMi+eRjlPAwc=
335-
github.com/dapr/dapr v1.10.0-rc.1 h1:+EL1FRABNeym1+sP4xE3UEBYhS4CBwlwiHzQmdrb5IA=
336-
github.com/dapr/dapr v1.10.0-rc.1/go.mod h1:FKbdohZfTLdum+UFlYGWWq70DZgxV9Tgu1omKsaxGVk=
333+
github.com/dapr/components-contrib v1.10.0-rc.2 h1:M2O8i8FM4ES4HVPkN3WQ6ZbJuopJnLyFvcloSluMKJQ=
334+
github.com/dapr/components-contrib v1.10.0-rc.2/go.mod h1:8OvVS4m3kK/ocDqhVYKdu4j7OS4gPlbXMi+eRjlPAwc=
335+
github.com/dapr/dapr v1.10.0-rc.2 h1:lTtoinTVdYnOcr+S5NqWv+E3tvnov1erRtRfcOJ+4ls=
336+
github.com/dapr/dapr v1.10.0-rc.2/go.mod h1:nO5hqRcuUlRWsQddX1haHCCJ0t+c4V03lxMCqToWwPA=
337337
github.com/dapr/go-sdk v1.6.0 h1:jg5A2khSCHF8bGZsig5RWN/gD0jjitszc2V6Uq2pPdY=
338338
github.com/dapr/go-sdk v1.6.0/go.mod h1:KLQBltoD9K0w5hKTihdcyg9Epob9gypwL5dYcQzPro4=
339339
github.com/dapr/kit v0.0.4 h1:i+7TIN4crC1Mo0JFyWpIkwAE8orlliA0O6/ibvs2AaE=

‎pkg/kubernetes/configurations_test.go‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,7 @@ func TestConfigurations(t *testing.T) {
130130
name: "Yaml one config",
131131
configName: "",
132132
outputFormat: "yaml",
133-
expectedOutput: "- name: appConfig\n namespace: default\n spec:\n apphttppipelinespec:\n handlers: []\n httppipelinespec:\n handlers: []\n tracingspec:\n samplingrate: \"\"\n stdout: false\n zipkin:\n endpointaddresss: \"\"\n otel:\n protocol: \"\"\n endpointAddress: \"\"\n isSecure: false\n metricspec:\n enabled: false\n rules: []\n metricsspec:\n enabled: false\n rules: []\n mtlsspec:\n enabled: false\n workloadcertttl: \"\"\n allowedclockskew: \"\"\n secrets:\n scopes: []\n accesscontrolspec:\n defaultAction: \"\"\n trustDomain: \"\"\n policies: []\n nameresolutionspec:\n component: \"\"\n version: \"\"\n configuration:\n json:\n raw: []\n features: []\n apispec:\n allowed: []\n componentsspec: {}\n loggingspec:\n apiLogging:\n enabled: false\n omitHealthChecks: false\n",
133+
expectedOutput: "- name: appConfig\n namespace: default\n spec:\n apphttppipelinespec:\n handlers: []\n httppipelinespec:\n handlers: []\n tracingspec:\n samplingrate: \"\"\n stdout: false\n zipkin:\n endpointaddresss: \"\"\n otel:\n protocol: \"\"\n endpointAddress: \"\"\n isSecure: false\n metricspec:\n enabled: false\n rules: []\n metricsspec:\n enabled: false\n rules: []\n mtlsspec:\n enabled: false\n workloadcertttl: \"\"\n allowedclockskew: \"\"\n secrets:\n scopes: []\n accesscontrolspec:\n defaultAction: \"\"\n trustDomain: \"\"\n policies: []\n nameresolutionspec:\n component: \"\"\n version: \"\"\n configuration:\n json:\n raw: []\n features: []\n apispec:\n allowed: []\n componentsspec: {}\n loggingspec:\n apiLogging:\n enabled: false\n obfuscateURLs: false\n omitHealthChecks: false\n",
134134
errString: "",
135135
errorExpected: false,
136136
k8sConfig: []v1alpha1.Configuration{
@@ -148,7 +148,7 @@ func TestConfigurations(t *testing.T) {
148148
name: "Yaml two configs",
149149
configName: "",
150150
outputFormat: "yaml",
151-
expectedOutput: "- name: appConfig1\n namespace: default\n spec:\n apphttppipelinespec:\n handlers: []\n httppipelinespec:\n handlers: []\n tracingspec:\n samplingrate: \"\"\n stdout: false\n zipkin:\n endpointaddresss: \"\"\n otel:\n protocol: \"\"\n endpointAddress: \"\"\n isSecure: false\n metricspec:\n enabled: false\n rules: []\n metricsspec:\n enabled: false\n rules: []\n mtlsspec:\n enabled: false\n workloadcertttl: \"\"\n allowedclockskew: \"\"\n secrets:\n scopes: []\n accesscontrolspec:\n defaultAction: \"\"\n trustDomain: \"\"\n policies: []\n nameresolutionspec:\n component: \"\"\n version: \"\"\n configuration:\n json:\n raw: []\n features: []\n apispec:\n allowed: []\n componentsspec: {}\n loggingspec:\n apiLogging:\n enabled: false\n omitHealthChecks: false\n- name: appConfig2\n namespace: default\n spec:\n apphttppipelinespec:\n handlers: []\n httppipelinespec:\n handlers: []\n tracingspec:\n samplingrate: \"\"\n stdout: false\n zipkin:\n endpointaddresss: \"\"\n otel:\n protocol: \"\"\n endpointAddress: \"\"\n isSecure: false\n metricspec:\n enabled: false\n rules: []\n metricsspec:\n enabled: false\n rules: []\n mtlsspec:\n enabled: false\n workloadcertttl: \"\"\n allowedclockskew: \"\"\n secrets:\n scopes: []\n accesscontrolspec:\n defaultAction: \"\"\n trustDomain: \"\"\n policies: []\n nameresolutionspec:\n component: \"\"\n version: \"\"\n configuration:\n json:\n raw: []\n features: []\n apispec:\n allowed: []\n componentsspec: {}\n loggingspec:\n apiLogging:\n enabled: false\n omitHealthChecks: false\n",
151+
expectedOutput: "- name: appConfig1\n namespace: default\n spec:\n apphttppipelinespec:\n handlers: []\n httppipelinespec:\n handlers: []\n tracingspec:\n samplingrate: \"\"\n stdout: false\n zipkin:\n endpointaddresss: \"\"\n otel:\n protocol: \"\"\n endpointAddress: \"\"\n isSecure: false\n metricspec:\n enabled: false\n rules: []\n metricsspec:\n enabled: false\n rules: []\n mtlsspec:\n enabled: false\n workloadcertttl: \"\"\n allowedclockskew: \"\"\n secrets:\n scopes: []\n accesscontrolspec:\n defaultAction: \"\"\n trustDomain: \"\"\n policies: []\n nameresolutionspec:\n component: \"\"\n version: \"\"\n configuration:\n json:\n raw: []\n features: []\n apispec:\n allowed: []\n componentsspec: {}\n loggingspec:\n apiLogging:\n enabled: false\n obfuscateURLs: false\n omitHealthChecks: false\n- name: appConfig2\n namespace: default\n spec:\n apphttppipelinespec:\n handlers: []\n httppipelinespec:\n handlers: []\n tracingspec:\n samplingrate: \"\"\n stdout: false\n zipkin:\n endpointaddresss: \"\"\n otel:\n protocol: \"\"\n endpointAddress: \"\"\n isSecure: false\n metricspec:\n enabled: false\n rules: []\n metricsspec:\n enabled: false\n rules: []\n mtlsspec:\n enabled: false\n workloadcertttl: \"\"\n allowedclockskew: \"\"\n secrets:\n scopes: []\n accesscontrolspec:\n defaultAction: \"\"\n trustDomain: \"\"\n policies: []\n nameresolutionspec:\n component: \"\"\n version: \"\"\n configuration:\n json:\n raw: []\n features: []\n apispec:\n allowed: []\n componentsspec: {}\n loggingspec:\n apiLogging:\n enabled: false\n obfuscateURLs: false\n omitHealthChecks: false\n",
152152
errString: "",
153153
errorExpected: false,
154154
k8sConfig: []v1alpha1.Configuration{
@@ -174,7 +174,7 @@ func TestConfigurations(t *testing.T) {
174174
name: "Json one config",
175175
configName: "",
176176
outputFormat: "json",
177-
expectedOutput: "[\n {\n \"name\": \"appConfig\",\n \"namespace\": \"default\",\n \"spec\": {\n \"appHttpPipeline\": {\n \"handlers\": null\n },\n \"httpPipeline\": {\n \"handlers\": null\n },\n \"tracing\": {\n \"samplingRate\": \"\",\n \"stdout\": false,\n \"zipkin\": {\n \"endpointAddress\": \"\"\n },\n \"otel\": {\n \"protocol\": \"\",\n \"endpointAddress\": \"\",\n \"isSecure\": false\n }\n },\n \"metric\": {\n \"enabled\": false,\n \"rules\": null\n },\n \"metrics\": {\n \"enabled\": false,\n \"rules\": null\n },\n \"mtls\": {\n \"enabled\": false,\n \"workloadCertTTL\": \"\",\n \"allowedClockSkew\": \"\"\n },\n \"secrets\": {\n \"scopes\": null\n },\n \"accessControl\": {\n \"defaultAction\": \"\",\n \"trustDomain\": \"\",\n \"policies\": null\n },\n \"nameResolution\": {\n \"component\": \"\",\n \"version\": \"\",\n \"configuration\": null\n },\n \"api\": {},\n \"components\": {},\n \"logging\": {\n \"apiLogging\": {\n \"enabled\": false,\n \"omitHealthChecks\": false\n }\n }\n }\n }\n]",
177+
expectedOutput: "[\n {\n \"name\": \"appConfig\",\n \"namespace\": \"default\",\n \"spec\": {\n \"appHttpPipeline\": {\n \"handlers\": null\n },\n \"httpPipeline\": {\n \"handlers\": null\n },\n \"tracing\": {\n \"samplingRate\": \"\",\n \"stdout\": false,\n \"zipkin\": {\n \"endpointAddress\": \"\"\n },\n \"otel\": {\n \"protocol\": \"\",\n \"endpointAddress\": \"\",\n \"isSecure\": false\n }\n },\n \"metric\": {\n \"enabled\": false,\n \"rules\": null\n },\n \"metrics\": {\n \"enabled\": false,\n \"rules\": null\n },\n \"mtls\": {\n \"enabled\": false,\n \"workloadCertTTL\": \"\",\n \"allowedClockSkew\": \"\"\n },\n \"secrets\": {\n \"scopes\": null\n },\n \"accessControl\": {\n \"defaultAction\": \"\",\n \"trustDomain\": \"\",\n \"policies\": null\n },\n \"nameResolution\": {\n \"component\": \"\",\n \"version\": \"\",\n \"configuration\": null\n },\n \"api\": {},\n \"components\": {},\n \"logging\": {\n \"apiLogging\": {\n \"enabled\": false,\n \"obfuscateURLs\": false,\n \"omitHealthChecks\": false\n }\n }\n }\n }\n]",
178178
errString: "",
179179
errorExpected: false,
180180
k8sConfig: []v1alpha1.Configuration{
@@ -192,7 +192,7 @@ func TestConfigurations(t *testing.T) {
192192
name: "Json two configs",
193193
configName: "",
194194
outputFormat: "json",
195-
expectedOutput: "[\n {\n \"name\": \"appConfig1\",\n \"namespace\": \"default\",\n \"spec\": {\n \"appHttpPipeline\": {\n \"handlers\": null\n },\n \"httpPipeline\": {\n \"handlers\": null\n },\n \"tracing\": {\n \"samplingRate\": \"\",\n \"stdout\": false,\n \"zipkin\": {\n \"endpointAddress\": \"\"\n },\n \"otel\": {\n \"protocol\": \"\",\n \"endpointAddress\": \"\",\n \"isSecure\": false\n }\n },\n \"metric\": {\n \"enabled\": false,\n \"rules\": null\n },\n \"metrics\": {\n \"enabled\": false,\n \"rules\": null\n },\n \"mtls\": {\n \"enabled\": false,\n \"workloadCertTTL\": \"\",\n \"allowedClockSkew\": \"\"\n },\n \"secrets\": {\n \"scopes\": null\n },\n \"accessControl\": {\n \"defaultAction\": \"\",\n \"trustDomain\": \"\",\n \"policies\": null\n },\n \"nameResolution\": {\n \"component\": \"\",\n \"version\": \"\",\n \"configuration\": null\n },\n \"api\": {},\n \"components\": {},\n \"logging\": {\n \"apiLogging\": {\n \"enabled\": false,\n \"omitHealthChecks\": false\n }\n }\n }\n },\n {\n \"name\": \"appConfig2\",\n \"namespace\": \"default\",\n \"spec\": {\n \"appHttpPipeline\": {\n \"handlers\": null\n },\n \"httpPipeline\": {\n \"handlers\": null\n },\n \"tracing\": {\n \"samplingRate\": \"\",\n \"stdout\": false,\n \"zipkin\": {\n \"endpointAddress\": \"\"\n },\n \"otel\": {\n \"protocol\": \"\",\n \"endpointAddress\": \"\",\n \"isSecure\": false\n }\n },\n \"metric\": {\n \"enabled\": false,\n \"rules\": null\n },\n \"metrics\": {\n \"enabled\": false,\n \"rules\": null\n },\n \"mtls\": {\n \"enabled\": false,\n \"workloadCertTTL\": \"\",\n \"allowedClockSkew\": \"\"\n },\n \"secrets\": {\n \"scopes\": null\n },\n \"accessControl\": {\n \"defaultAction\": \"\",\n \"trustDomain\": \"\",\n \"policies\": null\n },\n \"nameResolution\": {\n \"component\": \"\",\n \"version\": \"\",\n \"configuration\": null\n },\n \"api\": {},\n \"components\": {},\n \"logging\": {\n \"apiLogging\": {\n \"enabled\": false,\n \"omitHealthChecks\": false\n }\n }\n }\n }\n]",
195+
expectedOutput: "[\n {\n \"name\": \"appConfig1\",\n \"namespace\": \"default\",\n \"spec\": {\n \"appHttpPipeline\": {\n \"handlers\": null\n },\n \"httpPipeline\": {\n \"handlers\": null\n },\n \"tracing\": {\n \"samplingRate\": \"\",\n \"stdout\": false,\n \"zipkin\": {\n \"endpointAddress\": \"\"\n },\n \"otel\": {\n \"protocol\": \"\",\n \"endpointAddress\": \"\",\n \"isSecure\": false\n }\n },\n \"metric\": {\n \"enabled\": false,\n \"rules\": null\n },\n \"metrics\": {\n \"enabled\": false,\n \"rules\": null\n },\n \"mtls\": {\n \"enabled\": false,\n \"workloadCertTTL\": \"\",\n \"allowedClockSkew\": \"\"\n },\n \"secrets\": {\n \"scopes\": null\n },\n \"accessControl\": {\n \"defaultAction\": \"\",\n \"trustDomain\": \"\",\n \"policies\": null\n },\n \"nameResolution\": {\n \"component\": \"\",\n \"version\": \"\",\n \"configuration\": null\n },\n \"api\": {},\n \"components\": {},\n \"logging\": {\n \"apiLogging\": {\n \"enabled\": false,\n \"obfuscateURLs\": false,\n \"omitHealthChecks\": false\n }\n }\n }\n },\n {\n \"name\": \"appConfig2\",\n \"namespace\": \"default\",\n \"spec\": {\n \"appHttpPipeline\": {\n \"handlers\": null\n },\n \"httpPipeline\": {\n \"handlers\": null\n },\n \"tracing\": {\n \"samplingRate\": \"\",\n \"stdout\": false,\n \"zipkin\": {\n \"endpointAddress\": \"\"\n },\n \"otel\": {\n \"protocol\": \"\",\n \"endpointAddress\": \"\",\n \"isSecure\": false\n }\n },\n \"metric\": {\n \"enabled\": false,\n \"rules\": null\n },\n \"metrics\": {\n \"enabled\": false,\n \"rules\": null\n },\n \"mtls\": {\n \"enabled\": false,\n \"workloadCertTTL\": \"\",\n \"allowedClockSkew\": \"\"\n },\n \"secrets\": {\n \"scopes\": null\n },\n \"accessControl\": {\n \"defaultAction\": \"\",\n \"trustDomain\": \"\",\n \"policies\": null\n },\n \"nameResolution\": {\n \"component\": \"\",\n \"version\": \"\",\n \"configuration\": null\n },\n \"api\": {},\n \"components\": {},\n \"logging\": {\n \"apiLogging\": {\n \"enabled\": false,\n \"obfuscateURLs\": false,\n \"omitHealthChecks\": false\n }\n }\n }\n }\n]",
196196
errString: "",
197197
errorExpected: false,
198198
k8sConfig: []v1alpha1.Configuration{

‎tests/e2e/standalone/run_test.go‎

Lines changed: 24 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,9 @@ func TestStandaloneRun(t *testing.T) {
9595
t.Log(output)
9696
require.NoError(t, err, "run failed")
9797
assert.Contains(t, output, "level=info msg=\"HTTP API Called\" app_id=enableApiLogging_info")
98-
assert.Contains(t, output, "method=\"PUT /v1.0/metadata/{key}\"")
98+
assert.Contains(t, output, "method=\"PUT /v1.0/metadata/appCommand\"")
99+
assert.Contains(t, output, "method=\"PUT /v1.0/metadata/cliPID\"")
100+
assert.Contains(t, output, "method=\"PUT /v1.0/metadata/appPID\"")
99101
assert.Contains(t, output, "Exited App successfully")
100102
assert.Contains(t, output, "Exited Dapr successfully")
101103
})
@@ -112,6 +114,27 @@ func TestStandaloneRun(t *testing.T) {
112114
assert.Contains(t, output, "Exited App successfully")
113115
assert.Contains(t, output, "Exited Dapr successfully")
114116
assert.NotContains(t, output, "level=info msg=\"HTTP API Called\" app_id=enableApiLogging_info")
117+
assert.NotContains(t, output, "method=\"PUT /v1.0/metadata/appCommand\"")
118+
assert.NotContains(t, output, "method=\"PUT /v1.0/metadata/cliPID\"")
119+
assert.NotContains(t, output, "method=\"PUT /v1.0/metadata/appPID\"")
120+
})
121+
122+
t.Run(fmt.Sprintf("check enableAPILogging with obfuscation through dapr config file"), func(t *testing.T) {
123+
args := []string{
124+
"--app-id", "enableApiLogging_info",
125+
"--config", "../testdata/config.yaml",
126+
"--", "bash", "-c", "echo 'test'",
127+
}
128+
129+
output, err := cmdRun("", args...)
130+
t.Log(output)
131+
require.NoError(t, err, "run failed")
132+
assert.Contains(t, output, "Exited App successfully")
133+
assert.Contains(t, output, "Exited Dapr successfully")
134+
assert.Contains(t, output, "level=info msg=\"HTTP API Called\" app_id=enableApiLogging_info")
135+
assert.Contains(t, output, "method=\"PUT /v1.0/metadata/{key}\"")
136+
assert.Contains(t, output, "method=\"PUT /v1.0/metadata/{key}\"")
137+
assert.Contains(t, output, "method=\"PUT /v1.0/metadata/{key}\"")
115138
})
116139

117140
t.Run(fmt.Sprintf("check run with log JSON enabled"), func(t *testing.T) {

0 commit comments

Comments
 (0)