Skip to content

Commit c016206

Browse files
authored
Merge pull request #27 from conductor-oss/community-docs-cleanup-2
cleanup docs
2 parents 00c0673 + 5c06b37 commit c016206

File tree

69 files changed

+124
-289
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

69 files changed

+124
-289
lines changed

.github/ISSUE_TEMPLATE/feature_request.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ assignees: ''
77

88
---
99

10-
Please read our [contributor guide](https://github.com/Netflix/conductor/blob/main/CONTRIBUTING.md) before creating an issue.
11-
Also consider discussing your idea on the [discussion forum](https://github.com/Netflix/conductor/discussions) first.
10+
Please read our [contributor guide](https://github.com/conductor-oss/conductor/blob/main/CONTRIBUTING.md) before creating an issue.
11+
Also consider discussing your idea on the [discussion forum](https://github.com/conductor-oss/conductor/discussions) first.
1212

1313
## Describe the Feature Request
1414
_A clear and concise description of what the feature request is._

RELATED.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
[Related Projects](docs/docs/resources/related.md)
1+
[Related Projects](docs/resources/related.md)

annotations-processor/README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
[Annotations Processor](docs/docs/reference-docs/annotations-processor.md)
1+
[Annotations Processor](docs/documentation/advanced/annotation-processor.md)

awss3-storage/build.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2022 Netflix, Inc.
2+
* Copyright 2023 Conductor authors
33
* <p>
44
* Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
55
* the License. You may obtain a copy of the License at

build.gradle

+1-31
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ buildscript {
88
}
99
}
1010
dependencies {
11-
classpath 'com.netflix.nebula:gradle-extra-configurations-plugin:7.0.0'
1211
classpath 'org.springframework.boot:spring-boot-gradle-plugin:3.1.4'
1312
classpath 'com.diffplug.spotless:spotless-plugin-gradle:6.+'
1413
}
@@ -20,11 +19,10 @@ plugins {
2019
id 'application'
2120
id 'jacoco'
2221
id 'nebula.netflixoss' version '10.6.0'
23-
id 'org.sonarqube' version '3.4.0.2513'
2422
}
2523

2624
/*
27-
* Copyright 2021 Netflix, Inc.
25+
* Copyright 2023 Conductor authors
2826
* <p>
2927
* Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
3028
* the License. You may obtain a copy of the License at
@@ -66,26 +64,6 @@ allprojects {
6664

6765
repositories {
6866
mavenCentral()
69-
70-
// oss-candidate for -rc.* verions:
71-
maven {
72-
url "https://artifactory-oss.prod.netflix.net/artifactory/maven-oss-candidates"
73-
}
74-
75-
/**
76-
* This repository locates artifacts that don't exist in maven central but we had to backup from jcenter
77-
* The exclusiveContent
78-
*/
79-
exclusiveContent {
80-
forRepository {
81-
maven {
82-
url "https://artifactory-oss.prod.netflix.net/artifactory/required-jcenter-modules-backup"
83-
}
84-
}
85-
filter {
86-
includeGroupByRegex "com\\.github\\.vmg.*"
87-
}
88-
}
8967
}
9068

9169
dependencyManagement {
@@ -145,14 +123,6 @@ task server {
145123
dependsOn ':conductor-server:bootRun'
146124
}
147125

148-
sonarqube {
149-
properties {
150-
property "sonar.projectKey", "com.netflix.conductor:conductor"
151-
property "sonar.organization", "netflix"
152-
property "sonar.host.url", "https://sonarcloud.io"
153-
}
154-
}
155-
156126
configure(allprojects - project(':conductor-grpc')) {
157127
apply plugin: 'com.diffplug.spotless'
158128

cassandra-persistence/build.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2021 Netflix, Inc.
2+
* Copyright 2023 Conductor authors
33
* <p>
44
* Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
55
* the License. You may obtain a copy of the License at

common/build.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ dependencies {
2626
}
2727

2828
/*
29-
* Copyright 2021 Netflix, Inc.
29+
* Copyright 2023 Conductor authors
3030
* <p>
3131
* Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
3232
* the License. You may obtain a copy of the License at

core/build.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2021 Netflix, Inc.
2+
* Copyright 2023 Conductor authors
33
* <p>
44
* Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
55
* the License. You may obtain a copy of the License at

core/src/main/resources/META-INF/validation.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<!--
22
3-
Copyright 2020 Netflix, Inc.
3+
Copyright 2023 Conductor authors
44
55
Licensed under the Apache License, Version 2.0 (the "License");
66
you may not use this file except in compliance with the License.

core/src/main/resources/META-INF/validation/constraints.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<!--
33
4-
Copyright 2020 Netflix, Inc.
4+
Copyright 2023 Conductor authors
55
66
Licensed under the Apache License, Version 2.0 (the "License");
77
you may not use this file except in compliance with the License.

dependencies.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2022 Netflix, Inc.
2+
* Copyright 2023 Conductor authors
33
* <p>
44
* Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
55
* the License. You may obtain a copy of the License at

docker/server/bin/startup.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#!/bin/sh
22
#
3-
# Copyright 2021 Netflix, Inc.
3+
# Copyright 2023 Conductor authors
44
# <p>
55
# Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
66
# the License. You may obtain a copy of the License at

docker/server/config/log4j-file-appender.properties

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#
2-
# Copyright 2020 Netflix, Inc.
2+
# Copyright 2023 Conductor authors
33
#
44
# Licensed under the Apache License, Version 2.0 (the "License");
55
# you may not use this file except in compliance with the License.

docker/server/config/log4j.properties

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#
2-
# Copyright 2017 Netflix, Inc.
2+
# Copyright 2023 Conductor authors
33
#
44
# Licensed under the Apache License, Version 2.0 (the "License");
55
# you may not use this file except in compliance with the License.

docker/ui/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#
2-
# conductor:ui - Netflix Conductor UI
2+
# conductor:ui - Conductor UI
33
#
44
FROM node:20-alpine
55
LABEL maintainer="Orkes OSS <[email protected]>"

docs/css/custom.css

-9
Original file line numberDiff line numberDiff line change
@@ -161,15 +161,6 @@ body {
161161
background-size: cover;
162162
}
163163

164-
/* Footer */
165-
.md-copyright__highlight {
166-
background-image: url('/img/netflix-oss.png');
167-
background-size: contain;
168-
background-repeat: no-repeat;
169-
color: rgba(0,0,0,0);
170-
height: 60px;
171-
}
172-
173164
/* Comparison block */
174165
.compare {
175166
background-color: var(--brand-lt-blue);

docs/devguide/architecture/technicaldetails.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ The goal is to allow only one decide to run on a workflow at any given time acro
5959
**Preventing stale data updates with fencing tokens:**
6060
While the locking service helps to run one decide at a time, it might still be possible for nodes with timed out locks to reactivate and continue execution from where it left off (usually with stale data). This can be avoided with fencing tokens, which basically is an incrementing counter on workflow state with read-before-write support in a transaction or similar construct.
6161

62-
*At Netflix, we use Cassandra. Considering the tradeoffs of Cassandra’s Lightweight Transactions (LWT) and the probability of this stale updates happening, and our testing results, we’ve decided to first only rollout distributed locking with Zookeeper. We'll monitor our system and add C* LWT if needed.
62+
*Netflix uses Cassandra. Considering the tradeoffs of Cassandra’s Lightweight Transactions (LWT) and the probability of this stale updates happening, and our testing results, we’ve decided to first only rollout distributed locking with Zookeeper. We'll monitor our system and add C* LWT if needed.
6363

6464
#### Setting up desired level of consistency
6565

docs/devguide/concepts/why.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# Why Conductor?
2-
Conductor was built to help Netflix orchestrate microservices based process flows.
2+
Conductor was built to help orchestrate microservices based process flows.
33

44
## Features
55

docs/devguide/faq.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ Conductor, however will run [system tasks](../documentation/configuration/workfl
2525

2626
## How can I schedule workflows to run at a specific time?
2727

28-
Netflix Conductor itself does not provide any scheduling mechanism. But there is a community project [_Schedule Conductor Workflows_](https://github.com/jas34/scheduledwf) which provides workflow scheduling capability as a pluggable module as well as workflow server.
28+
Conductor itself does not provide any scheduling mechanism. But there is a community project [_Schedule Conductor Workflows_](https://github.com/jas34/scheduledwf) which provides workflow scheduling capability as a pluggable module as well as workflow server.
2929
Other way is you can use any of the available scheduling systems to make REST calls to Conductor to start a workflow. Alternatively, publish a message to a supported eventing system like SQS to trigger a workflow.
3030
More details about [eventing](../documentation/configuration/eventhandlers.md).
3131

Original file line numberDiff line numberDiff line change
@@ -1,56 +1,3 @@
11
# Build a Go Task Worker
22

3-
## Install
4-
```shell
5-
go get github.com/netflix/conductor/client/go
6-
```
7-
This will create a Go project under $GOPATH/src and download any dependencies.
8-
9-
## Implementing a Task a Worker
10-
`task`package provies the types used to implement the worker. Here is a reference worker implementation:
11-
12-
```go
13-
package task
14-
15-
import (
16-
"fmt"
17-
)
18-
19-
// Implementation for "task_1"
20-
func Task_1_Execution_Function(t *task.Task) (taskResult *task.TaskResult, err error) {
21-
log.Println("Executing Task_1_Execution_Function for", t.TaskType)
22-
23-
//Do some logic
24-
taskResult = task.NewTaskResult(t)
25-
26-
output := map[string]interface{}{"task":"task_1", "key2":"value2", "key3":3, "key4":false}
27-
taskResult.OutputData = output
28-
taskResult.Status = "COMPLETED"
29-
err = nil
30-
31-
return taskResult, err
32-
}
33-
```
34-
35-
## Worker Polling
36-
Here is an example that shows how to start polling for tasks after defining the tasks.
37-
38-
```go
39-
package main
40-
41-
import (
42-
"github.com/netflix/conductor/client/go"
43-
"github.com/netflix/conductor/client/go/task/sample"
44-
)
45-
46-
func main() {
47-
c := conductor.NewConductorWorker("{{ server_host }}", 1, 10000)
48-
49-
c.Start("task_1", "", sample.Task_1_Execution_Function, false)
50-
c.Start("task_2", "mydomain", sample.Task_2_Execution_Function, true)
51-
}
52-
```
53-
### `NewConductorWoker` parameters
54-
1. baseUrl: Server address.
55-
2. threadCount: No. of threads. Number of threads should be at-least same as the number of workers
56-
3. pollingInterval: Time in millisecond between subsequent polls
3+
See [conductor-sdk/conductor-go](https://github.com/conductor-sdk/conductor-go/blob/main/README.md)

docs/devguide/how-tos/Workers/build-a-java-task-worker.md

+3-3
Original file line numberDiff line numberDiff line change
@@ -70,14 +70,14 @@ Worker's core implementation logic goes in the `execute` method. Upon completion
7070

7171
The `getTaskDefName()` method returns the name of the task for which this worker provides the execution logic.
7272

73-
See [SampleWorker.java](https://github.com/Netflix/conductor/blob/main/client/src/test/java/com/netflix/conductor/client/sample/SampleWorker.java) for the complete example.
73+
See [SampleWorker.java](https://github.com/conductor-oss/conductor/blob/main/client/src/test/java/com/netflix/conductor/client/sample/SampleWorker.java) for the complete example.
7474

7575
## Configuring polling using TaskRunnerConfigurer
7676

7777
The `TaskRunnerConfigurer` can be used to register the worker(s) and initialize the polling loop.
7878
It manages the task workers thread pool and server communication (poll and task update).
7979

80-
Use the [Builder](https://github.com/Netflix/conductor/blob/main/client/src/main/java/com/netflix/conductor/client/automator/TaskRunnerConfigurer.java#L64) to create an instance of the `TaskRunnerConfigurer`. The builder accepts the following parameters:
80+
Use the [Builder](https://github.com/conductor-oss/conductor/blob/main/client/src/main/java/com/netflix/conductor/client/automator/TaskRunnerConfigurer.java#L64) to create an instance of the `TaskRunnerConfigurer`. The builder accepts the following parameters:
8181

8282
```java
8383
TaskClient taskClient = new TaskClient();
@@ -97,7 +97,7 @@ Use the [Builder](https://github.com/Netflix/conductor/blob/main/client/src/main
9797
configurer.init();
9898
```
9999

100-
See [Sample](https://github.com/Netflix/conductor/blob/main/client/src/test/java/com/netflix/conductor/client/sample/Main.java) for full example.
100+
See [Sample](https://github.com/conductor-oss/conductor/blob/main/client/src/test/java/com/netflix/conductor/client/sample/Main.java) for full example.
101101

102102
### Configuration Details
103103

Original file line numberDiff line numberDiff line change
@@ -1,82 +1,4 @@
11
# Build a Python Task Worker
2-
## Install the python client
3-
```shell
4-
virtualenv conductorclient
5-
source conductorclient/bin/activate
6-
cd ../conductor/client/python
7-
python setup.py install
8-
```
9-
10-
## Implement a Task Worker
11-
[ConductorWorker](https://github.com/Netflix/conductor/blob/main/polyglot-clients/python/conductor/ConductorWorker.py#L36)
12-
class is used to implement task workers.
13-
The following script shows how to bring up two task workers named `book_flight` and `book_car`:
14-
15-
```python
16-
from __future__ import print_function
17-
from conductor.ConductorWorker import ConductorWorker
18-
19-
def book_flight_task(task):
20-
return {'status': 'COMPLETED', 'output': {'booking_ref': 2341111, 'airline': 'delta'}, 'logs': ['trying delta', 'skipping aa']}
21-
22-
def book_car_task(task):
23-
return {'status': 'COMPLETED', 'output': {'booking_ref': "84545fdfd", 'agency': 'hertz'}, 'logs': ['trying hertz']}
24-
25-
def main():
26-
print('Starting Travel Booking workflows')
27-
cc = ConductorWorker('{{ server_host }}{{ api_prefix }}', 1, 0.1)
28-
cc.start('book_flight', book_flight_task, False)
29-
cc.start('book_car', book_car_task, True)
30-
31-
if __name__ == '__main__':
32-
main()
33-
```
34-
### `ConductorWorker` parameters
35-
```python
36-
server_url: str
37-
The url to the server hosting the conductor api.
38-
Ex: '{{ server_host }}{{ api_prefix }}'
39-
40-
thread_count: int
41-
The number of threads that will be polling for and
42-
executing tasks in case of using the start method.
43-
44-
polling_interval: float
45-
The number of seconds that each worker thread will wait
46-
between polls to the conductor server.
47-
48-
worker_id: str, optional
49-
The worker_id of the worker that is going to execute the
50-
task. For further details, refer to the documentation
51-
By default, it is set to hostname of the machine
52-
```
53-
### `start` method parameters
54-
```pythhon
55-
taskType: str
56-
The name of the task that the worker is looking to execute
57-
58-
exec_function: function
59-
The function that the worker will execute. The function
60-
must return a dict with the `status`, `output` and `logs`
61-
keys present. If this is not present, an Exception will be
62-
raised
63-
64-
wait: bool
65-
Whether the worker will block execution of further code.
66-
Since the workers are being run in daemon threads, when the
67-
program completes execution, all the threads are destroyed.
68-
Setting wait to True prevents the program from ending.
69-
If multiple workers are being called from the same program,
70-
all but the last start call but have wait set to False.
71-
The last start call must always set wait to True. If a
72-
single worker is being called, set wait to True.
73-
74-
domain: str, optional
75-
The domain of the task under which the worker will run. For
76-
further details refer to the conductor server documentation
77-
By default, it is set to None
78-
```
792

803
See
81-
[https://github.com/Netflix/conductor/tree/main/polyglot-clients/python](https://github.com/Netflix/conductor/tree/main/polyglot-clients/python)
82-
for the source code.
4+
[conductor-sdk/conductor-python](https://github.com/conductor-sdk/conductor-python/blob/main/README.md)

docs/devguide/running/docker.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11

22
# Running Conductor Using Docker
33

4-
In this article we will explore how you can set up Netflix Conductor on your local machine using Docker compose.
4+
In this article we will explore how you can set up Conductor on your local machine using Docker compose.
55
The docker compose will bring up the following:
66

77
1. Conductor API Server
@@ -17,7 +17,7 @@ The docker compose will bring up the following:
1717
### 1. Clone the Conductor Code
1818

1919
```shell
20-
$ git clone https://github.com/Netflix/conductor.git
20+
$ git clone https://github.com/conductor-oss/conductor.git
2121
```
2222

2323
### 2. Build the Docker Compose

0 commit comments

Comments
 (0)