Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix: example errors & ci errors #787

Merged
merged 1 commit into from
Sep 14, 2022
Merged

fix: example errors & ci errors #787

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion configs/config.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
"server_name": "runtime",
"grpc_config": {
"hellos": {
"quick_start_demo": {
"helloworld": {
"type": "helloworld",
"hello": "greeting"
}
Expand Down
2 changes: 1 addition & 1 deletion configs/config_apollo.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
"server_name": "runtime",
"grpc_config": {
"hellos": {
"quick_start_demo": {
"helloworld": {
"type": "helloworld",
"hello": "greeting"
}
Expand Down
2 changes: 1 addition & 1 deletion configs/config_consul.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
"server_name": "runtime",
"grpc_config": {
"hellos": {
"quick_start_demo": {
"helloworld": {
"type": "helloworld",
"hello": "greeting"
}
Expand Down
2 changes: 1 addition & 1 deletion configs/config_file.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
"server_name": "runtime",
"grpc_config": {
"hellos": {
"quick_start_demo": {
"helloworld": {
"type": "helloworld",
"hello": "greeting"
}
Expand Down
2 changes: 1 addition & 1 deletion configs/config_file_qiniu_oss.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
"server_name": "runtime",
"grpc_config": {
"hellos": {
"quick_start_demo": {
"helloworld": {
"type": "helloworld",
"hello": "greeting"
}
Expand Down
2 changes: 1 addition & 1 deletion configs/config_file_tencentcloud_oss.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
"server_name": "runtime",
"grpc_config": {
"hellos": {
"quick_start_demo": {
"helloworld": {
"type": "helloworld",
"hello": "greeting"
}
Expand Down
2 changes: 1 addition & 1 deletion configs/config_mongo.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
"server_name": "runtime",
"grpc_config": {
"hellos": {
"quick_start_demo": {
"helloworld": {
"type": "helloworld",
"hello": "greeting"
}
Expand Down
2 changes: 1 addition & 1 deletion configs/config_redis.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
"server_name": "runtime",
"grpc_config": {
"hellos": {
"quick_start_demo": {
"helloworld": {
"type": "helloworld",
"hello": "greeting"
}
Expand Down
2 changes: 1 addition & 1 deletion configs/config_standalone.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
"server_name": "runtime",
"grpc_config": {
"hellos": {
"quick_start_demo": {
"helloworld": {
"type": "helloworld",
"hello": "greeting"
}
Expand Down
2 changes: 1 addition & 1 deletion configs/config_trace_jaeger.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
"server_name": "runtime",
"grpc_config": {
"hellos": {
"quick_start_demo": {
"helloworld": {
"type": "helloworld",
"hello": "greeting"
}
Expand Down
2 changes: 1 addition & 1 deletion configs/config_trace_skywalking.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
"server_name": "runtime",
"grpc_config": {
"hellos": {
"quick_start_demo": {
"helloworld": {
"type": "helloworld",
"hello": "greeting"
}
Expand Down
2 changes: 1 addition & 1 deletion configs/config_trace_zipkin.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
"server_name": "runtime",
"grpc_config": {
"hellos": {
"quick_start_demo": {
"helloworld": {
"type": "helloworld",
"hello": "greeting"
}
Expand Down
2 changes: 1 addition & 1 deletion configs/config_zookeeper.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
"server_name": "runtime",
"grpc_config": {
"hellos": {
"quick_start_demo": {
"helloworld": {
"type": "helloworld",
"hello": "greeting"
}
Expand Down
2 changes: 1 addition & 1 deletion configs/runtime_config.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
"server_name": "runtime",
"grpc_config": {
"hellos": {
"quick_start_demo": {
"helloworld": {
"type": "helloworld",
"hello": "greeting"
}
Expand Down
2 changes: 1 addition & 1 deletion demo/flowcontrol/client.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ func main() {

for i := 0; i < 10; i++ {
r, err := c.SayHello(context.Background(), &runtimev1pb.SayHelloRequest{
ServiceName: "quick_start_demo",
ServiceName: "helloworld",
})
if err != nil {
fmt.Println("get an error: ", err)
Expand Down
6 changes: 3 additions & 3 deletions demo/lifecycle/common/client.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ func main() {
// 1. invoke sayHello API
client := runtimev1pb.NewRuntimeClient(conn)
hello, err := client.SayHello(context.Background(), &runtimev1pb.SayHelloRequest{
ServiceName: "quick_start_demo",
ServiceName: "helloworld",
Name: "eva",
})
if err != nil {
Expand All @@ -36,7 +36,7 @@ func main() {
metaData["hello"] = "goodbye"
req := &runtimev1pb.DynamicConfiguration{ComponentConfig: &runtimev1pb.ComponentConfig{
Kind: "hellos",
Name: "quick_start_demo",
Name: "helloworld",
Metadata: metaData,
}}
_, err = c.ApplyConfiguration(context.Background(), req)
Expand All @@ -46,7 +46,7 @@ func main() {
// 3. invoke sayHello API again
client = runtimev1pb.NewRuntimeClient(conn)
hello, err = client.SayHello(context.Background(), &runtimev1pb.SayHelloRequest{
ServiceName: "quick_start_demo",
ServiceName: "helloworld",
Name: "eva",
})
if err != nil {
Expand Down
2 changes: 1 addition & 1 deletion deploy/k8s/sidecar/default_quickstart_counter.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ data:
"server_name": "runtime",
"grpc_config": {
"hellos": {
"quick_start_demo": {
"helloworld": {
"type": "helloworld",
"hello": "greeting"
}
Expand Down
2 changes: 1 addition & 1 deletion deploy/k8s/standalone/default_configmap.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ data:
"server_name": "runtime",
"grpc_config": {
"hellos": {
"quick_start_demo": {
"helloworld": {
"type": "helloworld",
"hello": "greeting"
}
Expand Down
2 changes: 1 addition & 1 deletion deploy/k8s/standalone/default_quickstart.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ data:
"server_name": "runtime",
"grpc_config": {
"hellos": {
"quick_start_demo": {
"helloworld": {
"type": "helloworld",
"hello": "greeting"
}
Expand Down
2 changes: 1 addition & 1 deletion docker/layotto-etcd/etcd_config.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
"server_name": "runtime",
"grpc_config": {
"hellos": {
"quick_start_demo": {
"helloworld": {
"type": "helloworld",
"hello": "greeting"
}
Expand Down
2 changes: 1 addition & 1 deletion docker/layotto-minio/config_minio.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
"server_name": "runtime",
"grpc_config": {
"hellos": {
"quick_start_demo": {
"helloworld": {
"type": "helloworld",
"hello": "greeting"
}
Expand Down
2 changes: 1 addition & 1 deletion docker/layotto-redis/config_redis.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
"server_name": "runtime",
"grpc_config": {
"hellos": {
"quick_start_demo": {
"helloworld": {
"type": "helloworld",
"hello": "greeting"
}
Expand Down
4 changes: 2 additions & 2 deletions docs/en/start/email/start.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,15 +71,15 @@ cd java-sdk

Build the demo:

```shell @if.not.exist examples-email/target/examples-email-1.1.0-jar-with-dependencies.jar
```shell @if.not.exist examples-email/target/examples-email-jar-with-dependencies.jar
# build example jar
mvn -f examples-email/pom.xml clean package
```

Run it:

```shell
java -jar examples-email/target/examples-email-1.1.0-jar-with-dependencies.jar
java -jar examples-email/target/examples-email-jar-with-dependencies.jar
```

If the following information is printed, the demo is successful:
Expand Down
4 changes: 2 additions & 2 deletions docs/en/start/lifecycle/start.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ TODO

[comment]: <> (Build the demo:)

[comment]: <> (```shell @if.not.exist examples-lifecycle/target/examples-lifecycle-1.1.0-jar-with-dependencies.jar)
[comment]: <> (```shell @if.not.exist examples-lifecycle/target/examples-lifecycle-jar-with-dependencies.jar)

[comment]: <> (# build example jar)

Expand All @@ -88,7 +88,7 @@ TODO

[comment]: <> (```shell)

[comment]: <> (java -jar examples-lifecycle/target/examples-lifecycle-1.1.0-jar-with-dependencies.jar)
[comment]: <> (java -jar examples-lifecycle/target/examples-lifecycle-jar-with-dependencies.jar)

[comment]: <> (```)

Expand Down
4 changes: 2 additions & 2 deletions docs/en/start/oss/start.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,15 +100,15 @@ cd java-sdk

Build the demo:

```shell @if.not.exist examples-oss/target/examples-oss-1.1.0-jar-with-dependencies.jar
```shell @if.not.exist examples-oss/target/examples-oss-jar-with-dependencies.jar
# build example jar
mvn -f examples-oss/pom.xml clean package
```

Run it:

```shell
java -jar examples-oss/target/examples-oss-1.1.0-jar-with-dependencies.jar
java -jar examples-oss/target/examples-oss-jar-with-dependencies.jar
```

If the following information is printed, the demo is successful:
Expand Down
4 changes: 2 additions & 2 deletions docs/en/start/phone/start.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,15 +71,15 @@ cd java-sdk

Build the demo:

```shell @if.not.exist examples-phone/target/examples-phone-1.1.0-jar-with-dependencies.jar
```shell @if.not.exist examples-phone/target/examples-phone-jar-with-dependencies.jar
# build example jar
mvn -f examples-phone/pom.xml clean package
```

Run it:

```shell
java -jar examples-phone/target/examples-phone-1.1.0-jar-with-dependencies.jar
java -jar examples-phone/target/examples-phone-jar-with-dependencies.jar
```

If the following information is printed, the demo is successful:
Expand Down
6 changes: 3 additions & 3 deletions docs/en/start/pubsub/start.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ Build and run it:
# build example jar
mvn -f examples-pubsub-subscriber/pom.xml clean package
# run the example
java -jar examples-pubsub-subscriber/target/examples-pubsub-subscriber-1.1.0-jar-with-dependencies.jar
java -jar examples-pubsub-subscriber/target/examples-pubsub-subscriber-jar-with-dependencies.jar
```

<!-- tabs:end -->
Expand Down Expand Up @@ -145,7 +145,7 @@ cd java-sdk

Build:

```shell @if.not.exist examples-pubsub-publisher/target/examples-pubsub-publisher-1.1.0-jar-with-dependencies.jar
```shell @if.not.exist examples-pubsub-publisher/target/examples-pubsub-publisher-jar-with-dependencies.jar
# build example jar
mvn -f examples-pubsub-publisher/pom.xml clean package
```
Expand All @@ -154,7 +154,7 @@ Run it:

```shell
# run the example
java -jar examples-pubsub-publisher/target/examples-pubsub-publisher-1.1.0-jar-with-dependencies.jar
java -jar examples-pubsub-publisher/target/examples-pubsub-publisher-jar-with-dependencies.jar
```

<!-- tabs:end -->
Expand Down
4 changes: 2 additions & 2 deletions docs/en/start/sequencer/start.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,15 +104,15 @@ cd java-sdk

Build the demo:

```shell @if.not.exist examples-sequencer/target/examples-sequencer-1.1.0-jar-with-dependencies.jar
```shell @if.not.exist examples-sequencer/target/examples-sequencer-jar-with-dependencies.jar
# build example jar
mvn -f examples-sequencer/pom.xml clean package
```

Run it:

```shell
java -jar examples-sequencer/target/examples-sequencer-1.1.0-jar-with-dependencies.jar
java -jar examples-sequencer/target/examples-sequencer-jar-with-dependencies.jar
```

If the following information is printed, the demo is successful:
Expand Down
4 changes: 2 additions & 2 deletions docs/en/start/state/start.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,15 +127,15 @@ cd java-sdk

Build the demo:

```shell @if.not.exist examples-state/target/examples-state-1.1.0-jar-with-dependencies.jar
```shell @if.not.exist examples-state/target/examples-state-jar-with-dependencies.jar
# build example jar
mvn -f examples-state/pom.xml clean package
```

Run it:

```
java -jar examples-state/target/examples-state-1.1.0-jar-with-dependencies.jar
java -jar examples-state/target/examples-state-jar-with-dependencies.jar
```

The demo will print the following message:
Expand Down
4 changes: 2 additions & 2 deletions docs/template/quickstart.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,15 +71,15 @@ cd java-sdk

Build the demo:

```shell @if.not.exist examples-{{$file_name}}/target/examples-{{$file_name}}-1.1.0-jar-with-dependencies.jar
```shell @if.not.exist examples-{{$file_name}}/target/examples-{{$file_name}}-jar-with-dependencies.jar
# build example jar
mvn -f examples-{{$file_name}}/pom.xml clean package
```

Run it:

```shell
java -jar examples-{{$file_name}}/target/examples-{{$file_name}}-1.1.0-jar-with-dependencies.jar
java -jar examples-{{$file_name}}/target/examples-{{$file_name}}-jar-with-dependencies.jar
```

If the following information is printed, the demo is successful:
Expand Down
4 changes: 2 additions & 2 deletions docs/template/quickstart_zh.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,15 +71,15 @@ cd java-sdk

构建 examples:

```shell @if.not.exist examples-{{$file_name}}/target/examples-{{$file_name}}-1.1.0-jar-with-dependencies.jar
```shell @if.not.exist examples-{{$file_name}}/target/examples-{{$file_name}}-jar-with-dependencies.jar
# build example jar
mvn -f examples-{{$file_name}}/pom.xml clean package
```

运行:

```shell
java -jar examples-{{$file_name}}/target/examples-{{$file_name}}-1.1.0-jar-with-dependencies.jar
java -jar examples-{{$file_name}}/target/examples-{{$file_name}}-jar-with-dependencies.jar
```

打印出以下信息说明运行成功:
Expand Down
2 changes: 1 addition & 1 deletion docs/zh/design/actuator/grpc-design-doc.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ func MyFunc(_ json.RawMessage) *grpc.Server {
"server_name":"runtime",
"grpc_config": {
"hellos": {
"quick_start_demo": {
"helloworld": {
"type": "helloworld",
"hello": "greeting"
}
Expand Down
Loading