Skip to content

Commit 76e452d

Browse files
authored
Lots of 3.0 documentation updates (#5261)
* Update all REST API endpoint references * Removed docs about generating client SDK (feature removed for now) * rename client to sdk * Build using local playbook * Updates to core documentation for 3.0 * Lots of changes to docs for the 3.0 release * Lots more docs changes
1 parent f2a0b13 commit 76e452d

File tree

84 files changed

+767
-853
lines changed

Some content is hidden

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

84 files changed

+767
-853
lines changed

docs-playbook/Dockerfile

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44
FROM ubuntu:latest
55

66
ENV BASE_DIR=/repository/docs-playbook
7-
ENV PLAYBOOK docs-playbook.yml
8-
ENV SEARCH_PLAYBOOK search-playbook.yml
7+
ENV PLAYBOOK=docs-playbook.yml
8+
ENV SEARCH_PLAYBOOK=search-playbook.yml
99

1010
VOLUME /repository
1111

docs-playbook/_build-all-local.sh

+7
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
#!/bin/sh
2+
3+
# Build the docker image
4+
docker build -t="apicurio/apicurio-docs-builder" --rm .
5+
6+
# Use the docker image to build the docs
7+
docker run --env PLAYBOOK=local-test-playbook.yml --env SEARCH_PLAYBOOK=local-test-playbook.yml -v $(pwd)/..:/repository apicurio/apicurio-docs-builder:latest

docs-playbook/docs-playbook.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ site:
66
content:
77
sources:
88
- url: https://github.com/Apicurio/apicurio-registry.git
9-
branches: 2.6.x,2.5.x,2.4.x,2.3.x,2.2.x,2.1.x,2.0.x,1.3.x
9+
branches: main,2.6.x,2.5.x,2.4.x,2.3.x,2.2.x,2.1.x,2.0.x,1.3.x
1010
start_path: docs
1111
edit_url: '{web_url}'
1212
- url: https://github.com/Apicurio/apicurio-registry-operator.git

docs-playbook/local-test-playbook.yml

+41
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,41 @@
1+
site:
2+
title: Apicurio Registry PREVIEW
3+
# the 404 page and sitemap files only get generated when the url property is set
4+
url: https://www.apicur.io/registry/docs
5+
start_page: apicurio-registry::index.adoc
6+
content:
7+
sources:
8+
- url: ../
9+
branches: HEAD
10+
start_path: docs
11+
12+
ui:
13+
bundle:
14+
url: https://raw.githubusercontent.com/Apicurio/apicurio-docs-ui/main/dist/ui-bundle.zip
15+
snapshot: true
16+
17+
runtime:
18+
cache_dir: ./target/antora-cache
19+
20+
output:
21+
dir: ./target/dist
22+
23+
asciidoc:
24+
attributes:
25+
plantuml-server-url: 'http://www.plantuml.com/plantuml'
26+
plantuml-fetch-diagram: true
27+
mod-loc: partial$
28+
registry-overview: link:assembly-intro-to-the-registry.html[Introduction to Apicurio Registry]
29+
registry-rules: link:assembly-intro-to-registry-rules.html[Introduction to Apicurio Registry rules]
30+
registry-artifact-reference: link:assembly-artifact-reference.html[Apicurio Registry artifact reference]
31+
registry-rule-reference: link:assembly-rule-reference.html[Apicurio Registry rule reference]
32+
registry-config-reference: link:assembly-config-reference.html[Apicurio Registry configuration reference]
33+
installing-the-registry-docker: link:assembly-installing-registry-docker.html[Installing Apicurio Registry using Docker]
34+
installing-the-registry-openshift: link:assembly-installing-registry-openshift.html[Installing Apicurio Registry on OpenShift]
35+
installing-the-registry-storage-openshift: link:assembly-installing-registry-storage-openshift.html[Installing Apicurio Registry storage on OpenShift]
36+
managing-registry-artifacts-ui: link:assembly-managing-registry-artifacts-ui.html[Managing Apicurio Registry content using the web console]
37+
managing-registry-artifacts-api: link:assembly-managing-registry-artifacts-api.html[Managing Apicurio Registry content using the REST API]
38+
managing-registry-artifacts-maven: link:assembly-managing-registry-artifacts-maven.html[Managing Apicurio Registry content using the Maven plug-in]
39+
sdk: link:assembly-using-the-registry-sdk.html[Managing Apicurio Registry content using an SDK]
40+
kafka-client-serdes: link:assembly-using-kafka-client-serdes.html[Validating schemas using Kafka client serializers/deserializers in Java clients]
41+
registry-client-serdes-config: link:assembly-configuring-kafka-client-serdes.html[Configuring Kafka serializers/deserializers in Java applications]

docs-playbook/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "apicurio-docs-playbook",
3-
"version": "1.0.0",
3+
"version": "3.0.0",
44
"description": "This folder contains the configuration and scripts used when building the Apicurio Registry documentation for publishing to the Apicurio project web site. We are using a tool called Antora to build the asciidoc based documentation into a publishable site. However, due to some issues with building on various platforms (I'm looking at you, Windows) and also some conflicts between what Antora builds and what our GitHub Pages (jekyll) project site expects, we have created a non-trivial (but automated) process for building the docs.",
55
"main": "index.js",
66
"scripts": {

docs-playbook/search-playbook.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ site:
66
content:
77
sources:
88
- url: https://github.com/Apicurio/apicurio-registry.git
9-
branches: 2.6.x
9+
branches: main
1010
start_path: docs
1111
edit_url: '{web_url}'
1212
- url: https://github.com/Apicurio/apicurio-registry-operator.git

docs/getting-started/master.adoc

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,5 +27,5 @@ include::assemblies/getting-started/assembly-all-registry-configurations.adoc[le
2727
include::assemblies/getting-started/assembly-managing-registry-artifacts-ui.adoc[leveloffset=+1]
2828
include::assemblies/getting-started/assembly-managing-registry-artifacts-api.adoc[leveloffset=+1]
2929
include::assemblies/getting-started/assembly-using-kafka-client-serdes.adoc[leveloffset=+1]
30-
include::assemblies/getting-started/assembly-using-the-registry-client.adoc[leveloffset=+1]
30+
include::assemblies/getting-started/assembly-using-the-registry-sdk.adoc[leveloffset=+1]
3131
include::assemblies/getting-started/assembly-registry-reference.adoc[leveloffset=+1]

docs/local-test-playbook.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,6 @@ asciidoc:
3636
managing-registry-artifacts-ui: link:assembly-managing-registry-artifacts-ui.html[Managing Apicurio Registry content using the web console]
3737
managing-registry-artifacts-api: link:assembly-managing-registry-artifacts-api.html[Managing Apicurio Registry content using the REST API]
3838
managing-registry-artifacts-maven: link:assembly-managing-registry-artifacts-maven.html[Managing Apicurio Registry content using the Maven plug-in]
39-
rest-client: link:assembly-using-the-registry-client.html[Managing Apicurio Registry content using a Java client]
39+
sdk: link:assembly-using-the-registry-sdk.html[Managing Apicurio Registry content using an SDK]
4040
kafka-client-serdes: link:assembly-using-kafka-client-serdes.html[Validating schemas using Kafka client serializers/deserializers in Java clients]
41-
registry-client-serdes-config: link:assembly-configuring-kafka-client-serdes.html[Configuring Kafka serializers/deserializers in Java clients]
41+
registry-client-serdes-config: link:assembly-configuring-kafka-client-serdes.html[Configuring Kafka serializers/deserializers in Java applications]
Loading
Loading
Loading
Loading

docs/modules/ROOT/nav.adoc

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
** xref:getting-started/assembly-installing-registry-storage-openshift.adoc[]
88
** link:https://www.apicur.io/registry/docs/apicurio-registry-operator/1.0.0/index.html[Apicurio Registry Operator documentation]
99
* Migration
10-
** xref:getting-started/assembly-migrating-registry-v1-v2.adoc[]
10+
** xref:getting-started/assembly-migrating-registry-v2-v3.adoc[]
1111
* Configuration
1212
** xref:getting-started/assembly-configuring-registry-security.adoc[]
1313
** xref:getting-started/assembly-configuring-the-registry.adoc[]

docs/modules/ROOT/pages/getting-started/assembly-artifact-reference.adoc

+4
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,9 @@ This chapter provides reference information on the supported artifact types, sta
1010

1111
* xref:registry-artifact-types_{context}[]
1212
* xref:registry-artifact-states_{context}[]
13+
* xref:registry-group-metadata_{context}[]
1314
* xref:registry-artifact-metadata_{context}[]
15+
* xref:registry-artifact-version-metadata_{context}[]
1416

1517
[role="_additional-resources"]
1618
.Additional resources
@@ -19,4 +21,6 @@ This chapter provides reference information on the supported artifact types, sta
1921
//INCLUDES
2022
include::{mod-loc}getting-started/ref-registry-artifact-types.adoc[leveloffset=+1]
2123
include::{mod-loc}getting-started/ref-registry-artifact-states.adoc[leveloffset=+1]
24+
include::{mod-loc}getting-started/ref-registry-group-metadata.adoc[leveloffset=+1]
2225
include::{mod-loc}getting-started/ref-registry-artifact-metadata.adoc[leveloffset=+1]
26+
include::{mod-loc}getting-started/ref-registry-artifact-version-metadata.adoc[leveloffset=+1]

docs/modules/ROOT/pages/getting-started/assembly-configuring-the-registry.adoc

+1-5
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,11 @@ include::{mod-loc}shared/all-attributes.adoc[]
55
= Configuring your {registry} deployment
66

77
[role="_abstract"]
8-
This chapter explains how to set important configuration options for your {registry} deployment. This includes features such as the {registry} web console, logging, events, and health checks:
8+
This chapter explains how to set important configuration options for your {registry} deployment. This includes features such as the {registry} web console, logging, and health checks:
99

1010
ifdef::apicurio-registry[]
1111
* xref:configuring-registry-ui_{context}[]
1212
endif::[]
13-
* xref:registry-logging_{context}[]
14-
* xref:registry-cloud-events_{context}[]
1513
* xref:configuring-liveness-readiness-probes_{context}[]
1614
* xref:registry-liveness-env-vars_{context}[]
1715

@@ -21,7 +19,5 @@ NOTE: For a list of all available configuration options, see {registry-config-re
2119
ifdef::apicurio-registry[]
2220
include::{mod-loc}getting-started/proc-configuring-registry-ui.adoc[leveloffset=+1]
2321
endif::[]
24-
include::{mod-loc}getting-started/proc-configuring-registry-logging.adoc[leveloffset=+1]
25-
include::{mod-loc}getting-started/proc-configuring-registry-events.adoc[leveloffset=+1]
2622
include::{mod-loc}getting-started/proc-configuring-liveness-readiness-probes.adoc[leveloffset=+1]
2723
include::{mod-loc}getting-started/ref-registry-liveness-env-vars.adoc[leveloffset=+1]

docs/modules/ROOT/pages/getting-started/assembly-installing-registry-docker.adoc

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ This chapter explains how to install and run {registry} using Docker with the fo
1414
.Prerequisites
1515
* {registry-overview}
1616

17-
NOTE: You can install more than one instance of {registry} depending on your environment. The number of instances depends on your storage option, for example, your Kafka or database cluster configuration, and on the number and type of artifacts stored in {registry}.
17+
NOTE: You can install more than one replica of {registry} depending on your environment. The number of replicas depends on your storage option, for example, your Kafka or database cluster configuration, and on the number and type of artifacts stored in {registry}.
1818

1919
[role="_additional-resources"]
2020
.Additional resources

docs/modules/ROOT/pages/getting-started/assembly-managing-registry-artifacts-api.adoc

+2-8
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,10 @@ include::{mod-loc}shared/all-attributes.adoc[]
66
//If the assembly covers a task, start the title with a verb in the gerund form, such as Creating or Configuring.
77

88
[role="_abstract"]
9-
Client applications can use {registry} REST API operations to manage schema and API artifacts in {registry}, for example, in a CI/CD pipeline deployed in production. The Core Registry API v2 provides operations for artifacts, versions, metadata, and rules stored in {registry}. For detailed information, see the {registry-rest-api}.
9+
Client applications can use {registry} REST API operations to manage schema and API artifacts in {registry}, for example, in a CI/CD pipeline deployed in production. The Core Registry API v3 provides operations for artifacts, versions, metadata, and rules stored in {registry}. For detailed information, see the {registry-rest-api}.
1010

11-
This chapter shows examples of how to use the Core Registry API v2 to perform the following tasks:
11+
This chapter shows examples of how to use the Core Registry API v3 to perform the following tasks:
1212

13-
ifdef::rh-openshift-sr[]
14-
* xref:creating-access-token-for-registry-rest-api_{context}[]
15-
endif::[]
1613
* xref:managing-artifacts-using-rest-api_{context}[]
1714
* xref:managing-artifact-versions-using-rest-api_{context}[]
1815
* xref:managing-artifact-references-using-rest-api_{context}[]
@@ -26,9 +23,6 @@ endif::[]
2623
* link:{attachmentsdir}/registry-rest-api.htm[Apicurio Registry REST API documentation]
2724

2825
//INCLUDES
29-
ifdef::rh-openshift-sr[]
30-
include::{mod-loc}getting-started/proc-creating-access-token-rest-api.adoc[leveloffset=+1]
31-
endif::[]
3226
include::{mod-loc}getting-started/proc-managing-artifacts-using-rest-api.adoc[leveloffset=+1]
3327
include::{mod-loc}getting-started/proc-managing-artifact-versions-using-rest-api.adoc[leveloffset=+1]
3428
include::{mod-loc}getting-started/proc-managing-artifact-references-using-rest-api.adoc[leveloffset=+1]

docs/modules/ROOT/pages/getting-started/assembly-managing-registry-artifacts-ui.adoc

-2
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@ endif::[]
1414
* xref:browsing-artifacts-using-console_{context}[]
1515
* xref:adding-artifacts-using-console_{context}[]
1616
* xref:configuring-rules-using-console_{context}[]
17-
* xref:generating-client-sdk-using-web-console_{context}[]
1817
* xref:changing-artifact-owner-using-console_{context}[]
1918
* xref:configuring-settings-using-console_{context}[]
2019
* xref:exporting-importing-using-web-console_{context}[]
@@ -27,7 +26,6 @@ endif::[]
2726
include::{mod-loc}getting-started/proc-browsing-artifacts-using-console.adoc[leveloffset=+1]
2827
include::{mod-loc}getting-started/proc-adding-artifacts-using-console.adoc[leveloffset=+1]
2928
include::{mod-loc}getting-started/proc-configuring-rules-using-console.adoc[leveloffset=+1]
30-
include::{mod-loc}getting-started/proc-generating-client-sdk-using-web-console.adoc[leveloffset=+1]
3129
include::{mod-loc}getting-started/proc-changing-artifact-owner-using-console.adoc[leveloffset=+1]
3230
include::{mod-loc}getting-started/proc-configuring-settings-using-console.adoc[leveloffset=+1]
3331
include::{mod-loc}getting-started/proc-exporting-importing-using-web-console.adoc[leveloffset=+1]

docs/modules/ROOT/pages/getting-started/assembly-migrating-registry-v1-v2.adoc docs/modules/ROOT/pages/getting-started/assembly-migrating-registry-v2-v3.adoc

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ include::{mod-loc}shared/all-attributes.adoc[]
66
= Migrating an existing {registry} deployment
77

88
[role="_abstract"]
9-
This chapter explains how to migrate an existing {registry} deployment from version {registry-v1} to version 2.x.
9+
This chapter explains how to migrate an existing {registry} deployment from version 2.x to version 3.x.
1010

1111
* xref:registry-migration_{context}[]
1212
* xref:migrating-registry-data_{context}[]
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
11
// Metadata created by nebel
22
include::{mod-loc}shared/all-attributes.adoc[]
33

4-
[id="using-the-registry-client_{context}"]
5-
= Managing {registry} content using a Java client
4+
[id="using-the-registry-sdk_{context}"]
5+
= Managing {registry} content using a SDK
66

77
[role="_abstract"]
8-
You can write a {registry} Java client application and use it to manage artifacts stored in {registry}:
8+
You can write a {registry} client application (in Java, Typescript, Python, or Golang) and use it to manage artifacts stored in {registry}:
99

10-
* xref:registry-client-intro_{context}[]
11-
* xref:writing-registry-client_{context}[]
12-
* xref:registry-client-config_{context}[]
10+
* xref:registry-sdk-intro_{context}[]
11+
* xref:writing-registry-sdk_{context}[]
12+
* xref:registry-sdk-config_{context}[]
1313

1414
//INCLUDES
15-
include::{mod-loc}getting-started/con-registry-client.adoc[leveloffset=+1]
16-
include::{mod-loc}getting-started/proc-writing-registry-client.adoc[leveloffset=+1]
17-
include::{mod-loc}getting-started/ref-registry-client.adoc[leveloffset=+1]
15+
include::{mod-loc}getting-started/con-registry-sdk.adoc[leveloffset=+1]
16+
include::{mod-loc}getting-started/proc-writing-registry-sdk.adoc[leveloffset=+1]
17+
include::{mod-loc}getting-started/ref-registry-sdk.adoc[leveloffset=+1]

docs/modules/ROOT/partials/getting-started/con-kafka-connect-converters.adoc

-5
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,7 @@
77
You can use {registry} with Apache Kafka Connect to stream data between Kafka and external systems. Using Kafka Connect, you can define connectors for different systems to move large volumes of data into and out of Kafka-based systems.
88

99
.{registry} and Kafka Connect architecture
10-
ifdef::apicurio-registry,rh-service-registry[]
1110
image::images/getting-started/registry-connect-architecture.png[Registry and Kafka Connect architecture]
12-
endif::[]
13-
ifdef::rh-openshift-sr[]
14-
image::../_images/introduction/registry-connect-architecture.png[Registry and Kafka Connect architecture]
15-
endif::[]
1611

1712
{registry} provides the following features for Kafka Connect:
1813

docs/modules/ROOT/partials/getting-started/con-registry-artifacts.adoc

+59-17
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,51 @@ The items stored in {registry}, such as event schemas and API designs, are known
2828

2929
When a schema or API design is added as an artifact in {registry}, client applications can then use that schema or API design to validate that the client messages conform to the correct data structure at runtime.
3030

31+
Artifacts have metadata, both generated and editable. Standard metadata for an artifact includes (but may not be limited to):
32+
33+
=== Generated or immutable properties
34+
35+
- groupId
36+
- artifactId
37+
- artifactType
38+
- createdOn
39+
- modifiedBy
40+
- modifiedOn
41+
42+
=== Editable properties
43+
- name
44+
- description
45+
- labels
46+
- owner
47+
48+
[discrete]
49+
== Artifact Versions
50+
Every artifact is composed of zero or more _artifact version_s. Only artifact versions have actual
51+
content (as well as metadata). These versions represent the evolution of the content of an artifact,
52+
and are immutable. You can think of an Artifact as an ordered sequence of Versions, typically with
53+
the most recent version representing the "current" schema or API design content.
54+
55+
56+
Artifact Versions have metadata, both generated and editable. Standard metadata for an artifact version includes (but may not be limited to):
57+
58+
=== Generated or immutable properties
59+
60+
- groupId
61+
- artifactId
62+
- version
63+
- globalId
64+
- contentId
65+
- owner
66+
- createdOn
67+
- modifiedBy
68+
- modifiedOn
69+
70+
=== Editable properties
71+
- name
72+
- description
73+
- labels
74+
- state
75+
3176

3277
[discrete]
3378
== Groups of schemas and APIs
@@ -38,20 +83,23 @@ You can create optional artifact groups when adding your schemas and API designs
3883

3984
Schema and API groups can contain multiple artifact types. For example, you could have Protobuf, Avro, JSON Schema, OpenAPI, or AsyncAPI artifacts all in the same group.
4085

41-
You can create schema and API artifacts and groups using the {registry} web console, REST API, command line, Maven plug-in, or Java client application. The following simple example shows using the Core Registry REST API:
86+
Groups have metadata, both generated and editable. Standard metadata for a group includes (but may not be limited to):
4287

43-
[source,bash]
44-
----
45-
$ curl -X POST -H "Content-type: application/json; artifactType=AVRO" \
46-
-H "X-Registry-ArtifactId: share-price" \
47-
--data '{"type":"record","name":"price","namespace":"com.example", \
48-
"fields":[{"name":"symbol","type":"string"},{"name":"price","type":"string"}]}' \
49-
https://my-registry.example.com/apis/registry/v2/groups/my-group/artifacts
50-
----
88+
=== Generated or immutable properties
89+
90+
- groupId
91+
- owner
92+
- createdOn
93+
- modifiedBy
94+
- modifiedOn
95+
96+
=== Editable properties
97+
- description
98+
- labels
5199

52-
This example creates an artifact group named `my-group` and adds an Avro schema with an artifact ID of `share-price`.
100+
You can create schema and API artifacts and groups using the {registry} web console, REST API, command line, Maven plug-in, or Java client application.
53101

54-
NOTE: Specifying a group is optional when using the {registry} web console, and a `default` group is created automatically. When using the REST API or Maven plug-in, specify the `default` group in the API path if you do not want to create a unique group.
102+
NOTE: Specifying a group is optional when using the {registry} web console, and the `default` group is used automatically. When using the REST API or Maven plug-in, specify the `default` group in the API path if you do not want to create a unique group.
55103

56104
[role="_additional-resources"]
57105
.Additional resources
@@ -121,12 +169,6 @@ You can manage artifact references using the {registry} core REST API, Maven plu
121169
.Additional resources
122170

123171
* For details on managing artifact references, see:
124-
ifdef::apicurio-registry,rh-service-registry[]
125172
** {managing-registry-artifacts-api}.
126173
** {managing-registry-artifacts-maven}.
127-
endif::[]
128-
ifdef::rh-openshift-sr[]
129-
** {base-url}{manage-api-url-registry}[Managing Service Registry data using the Core Registry API].
130-
** {base-url}{manage-maven-plugin-url-registry}[Managing schemas and APIs using the Service Registry Maven plug-in].
131-
endif::[]
132174
* For a Java example, see the https://github.com/Apicurio/apicurio-registry/tree/main/examples/serdes-with-references[Apicurio Registry SerDes with references demonstration].

0 commit comments

Comments
 (0)