From a891eb0d6c3f34aad8ac41dd5f64f1841c69af5b Mon Sep 17 00:00:00 2001 From: Emelia <105240296+emeliawilkinson24@users.noreply.github.com> Date: Tue, 12 Sep 2023 17:23:17 -0400 Subject: [PATCH 1/5] Update redirects in docs.yaml --- docs.yaml | 45 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 45 insertions(+) diff --git a/docs.yaml b/docs.yaml index c34324e170..22797cf004 100644 --- a/docs.yaml +++ b/docs.yaml @@ -79,3 +79,48 @@ rewrites: replace: https://docs.datastax.com/en/archived/cql/3.1/ - search: http://www.datastax.com/docs/1.2/cql_cli/cql/BATCH replace: https://docs.datastax.com/en/dse/6.7/cql/cql/cql_reference/cql_commands/cqlBatch.html + - search: 'https://(helpdocs|docs).datastax.com/(en/astra/)?(aws|gcp)/(dscloud/apollo|doc/dscloud/astra)/dscloudGettingStarted.html' + replace: 'https://docs.datastax.com/en/astra-serverless/docs/getting-started/getting-started.html' + - search: 'https://(helpdocs|docs).datastax.com/(en/astra/)?(aws|gcp)/(dscloud/apollo|doc/dscloud/astra)/dscloudObtainingCredentials.html' + replace: 'https://docs.datastax.com/en/astra-serverless/docs/connect/secure-connect-bundle.html' + - search: 'https://(helpdocs|docs).datastax.com/(en/astra/)?(aws|gcp)/(dscloud/apollo|doc/dscloud/astra)/dscloudShareClusterDetails.html' + replace: 'https://docs.datastax.com/en/astra-serverless/docs/manage/org/manage-tokens.html' + - search: 'http://downloads.datastax.com/java-driver/' + replace: 'https://downloads.datastax.com/#datastax-drivers' + - search: 'https://docs.datastax.com/en/drivers/java/(4.[0-9]+)/com/datastax/oss/driver/api/mapper/EntityHelper.html' + replace: 'https://docs.datastax.com/en/drivers/java/\1/com/datastax/oss/driver/api/mapper/entity/EntityHelper.html' + - search: '(http|https)://www.datastax.com/drivers/java/' + replace: 'https://docs.datastax.com/en/drivers/java/' + - search: 'http://docs.datastax.com/en/drivers/java' + replace: 'https://docs.datastax.com/en/drivers/java' + - search: 'https://docs.astra.datastax.com/docs/creating-your-astra-database' + replace: 'https://docs.datastax.com/en/astra-serverless/docs/getting-started/create-db-choices.html' + - search: 'https://docs.astra.datastax.com/docs/obtaining-database-credentials' + replace: 'https://docs.datastax.com/en/astra-serverless/docs/connect/secure-connect-bundle.html' + - search: 'https://docs.datastax.com/en/drivers/java/(4.[0-9]+)/com/datastax/oss/driver/api/core/cql/SyncCqlSession.html%60' + replace: 'https://docs.datastax.com/en/drivers/java/\1/com/datastax/oss/driver/api/core/cql/SyncCqlSession.html' + - search: 'https://code.google.com/p/snappy/' + replace: 'https://google.github.io/snappy/' + - search: 'https://code.google.com/p/guava-libraries/wiki/ListenableFutureExplained' + replace: 'https://github.com/google/guava/wiki/ListenableFutureExplained' + - search: 'https://community.datastax.com/index.html' + replace: 'https://www.datastax.com/workshops' +checks: + external_links: + exclude: + - 'https://twitter.com/dsJavaDriver' + - 'https://twitter.com/datastaxeng' + - 'https://twitter.com/datastax' + - 'https://projectreactor.io' + - 'https://docs.datastax.com/en/drivers/java/4.[0-9]+/com/datastax/oss/driver/internal/' + - 'http://www.planetcassandra.org/blog/user-defined-functions-in-cassandra-3-0/' + - 'http://www.planetcassandra.org/making-the-change-from-thrift-to-cql/' + - 'https://academy.datastax.com/slack' + - 'https://community.datastax.com/index.html' + - 'https://micrometer.io/docs' + - 'http://datastax.github.io/java-driver/features/shaded_jar/' + internal_links: + exclude: + - 'netty_pipeline/' + - '../core/' + - '%5Bguava%20eviction%5D' From 832a1255866e7ae166d09b88496ee39253952d8a Mon Sep 17 00:00:00 2001 From: Emelia <105240296+emeliawilkinson24@users.noreply.github.com> Date: Wed, 20 Sep 2023 15:51:13 -0400 Subject: [PATCH 2/5] moved aka link to excludes docs.yaml --- docs.yaml | 37 +++++++------------------------------ 1 file changed, 7 insertions(+), 30 deletions(-) diff --git a/docs.yaml b/docs.yaml index 22797cf004..99d3c09d01 100644 --- a/docs.yaml +++ b/docs.yaml @@ -73,38 +73,14 @@ versions: redirects: - \A\/(.*)/\Z: /\1.html rewrites: - - search: cassandra.apache.org/doc/cql3/CQL.html - replace: cassandra.apache.org/doc/cql3/CQL-3.0.html - - search: http://www.datastax.com/documentation/cql/3.1/ - replace: https://docs.datastax.com/en/archived/cql/3.1/ - search: http://www.datastax.com/docs/1.2/cql_cli/cql/BATCH replace: https://docs.datastax.com/en/dse/6.7/cql/cql/cql_reference/cql_commands/cqlBatch.html - - search: 'https://(helpdocs|docs).datastax.com/(en/astra/)?(aws|gcp)/(dscloud/apollo|doc/dscloud/astra)/dscloudGettingStarted.html' - replace: 'https://docs.datastax.com/en/astra-serverless/docs/getting-started/getting-started.html' - - search: 'https://(helpdocs|docs).datastax.com/(en/astra/)?(aws|gcp)/(dscloud/apollo|doc/dscloud/astra)/dscloudObtainingCredentials.html' - replace: 'https://docs.datastax.com/en/astra-serverless/docs/connect/secure-connect-bundle.html' - - search: 'https://(helpdocs|docs).datastax.com/(en/astra/)?(aws|gcp)/(dscloud/apollo|doc/dscloud/astra)/dscloudShareClusterDetails.html' - replace: 'https://docs.datastax.com/en/astra-serverless/docs/manage/org/manage-tokens.html' - - search: 'http://downloads.datastax.com/java-driver/' - replace: 'https://downloads.datastax.com/#datastax-drivers' - - search: 'https://docs.datastax.com/en/drivers/java/(4.[0-9]+)/com/datastax/oss/driver/api/mapper/EntityHelper.html' - replace: 'https://docs.datastax.com/en/drivers/java/\1/com/datastax/oss/driver/api/mapper/entity/EntityHelper.html' - - search: '(http|https)://www.datastax.com/drivers/java/' - replace: 'https://docs.datastax.com/en/drivers/java/' - - search: 'http://docs.datastax.com/en/drivers/java' - replace: 'https://docs.datastax.com/en/drivers/java' - - search: 'https://docs.astra.datastax.com/docs/creating-your-astra-database' - replace: 'https://docs.datastax.com/en/astra-serverless/docs/getting-started/create-db-choices.html' - - search: 'https://docs.astra.datastax.com/docs/obtaining-database-credentials' - replace: 'https://docs.datastax.com/en/astra-serverless/docs/connect/secure-connect-bundle.html' - - search: 'https://docs.datastax.com/en/drivers/java/(4.[0-9]+)/com/datastax/oss/driver/api/core/cql/SyncCqlSession.html%60' - replace: 'https://docs.datastax.com/en/drivers/java/\1/com/datastax/oss/driver/api/core/cql/SyncCqlSession.html' - - search: 'https://code.google.com/p/snappy/' - replace: 'https://google.github.io/snappy/' - - search: 'https://code.google.com/p/guava-libraries/wiki/ListenableFutureExplained' - replace: 'https://github.com/google/guava/wiki/ListenableFutureExplained' - - search: 'https://community.datastax.com/index.html' - replace: 'https://www.datastax.com/workshops' + - search: http://www.datastax.com/documentation/cql/3.1/ + replace: https://docs.datastax.com/en/archived/cql/3.1/ + - search: 'https://community.datastax.com' + replace: 'https://www.datastax.com/dev/community' + - search: 'https://docs.datastax.com/en/astra/aws/doc/index.html' + replace: 'https://docs.datastax.com/en/astra-serverless/docs/connect/drivers/connect-python.html' checks: external_links: exclude: @@ -119,6 +95,7 @@ checks: - 'https://community.datastax.com/index.html' - 'https://micrometer.io/docs' - 'http://datastax.github.io/java-driver/features/shaded_jar/' + - 'http://aka.ms/vcpython27' internal_links: exclude: - 'netty_pipeline/' From 961c75b8a7985c7cf0f37217731bba03aeef709c Mon Sep 17 00:00:00 2001 From: Emelia <105240296+emeliawilkinson24@users.noreply.github.com> Date: Wed, 20 Sep 2023 16:39:52 -0400 Subject: [PATCH 3/5] added rewrites from Bret docs.yaml --- docs.yaml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/docs.yaml b/docs.yaml index 99d3c09d01..e4aa576fb9 100644 --- a/docs.yaml +++ b/docs.yaml @@ -81,6 +81,14 @@ rewrites: replace: 'https://www.datastax.com/dev/community' - search: 'https://docs.datastax.com/en/astra/aws/doc/index.html' replace: 'https://docs.datastax.com/en/astra-serverless/docs/connect/drivers/connect-python.html' + - search: 'http://cassandra.apache.org/doc/cql3/CQL-3.0.html#timeuuidFun' + replace: 'https://cassandra.apache.org/doc/3.11/cassandra/cql/functions.html#timeuuid-functions' + - search: 'http://cassandra.apache.org/doc/cql3/CQL-3.0.html#tokenFun' + replace: 'https://cassandra.apache.org/doc/3.11/cassandra/cql/functions.html#token' + - search: 'http://cassandra.apache.org/doc/cql3/CQL-3.0.html#collections' + replace: 'https://cassandra.apache.org/doc/3.11/cassandra/cql/types.html#collections' + - search: 'http://cassandra.apache.org/doc/cql3/CQL-3.0.html#batchStmt' + replace: 'https://cassandra.apache.org/doc/3.11/cassandra/cql/dml.html#batch_statement' checks: external_links: exclude: From ae2073819888c8b23552b63fcde4e70965426ea7 Mon Sep 17 00:00:00 2001 From: Emelia <105240296+emeliawilkinson24@users.noreply.github.com> Date: Thu, 21 Sep 2023 13:11:46 -0400 Subject: [PATCH 4/5] fixing rewrites per Brets instructions in docs.yaml --- docs.yaml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/docs.yaml b/docs.yaml index e4aa576fb9..a4d8555ec5 100644 --- a/docs.yaml +++ b/docs.yaml @@ -81,13 +81,13 @@ rewrites: replace: 'https://www.datastax.com/dev/community' - search: 'https://docs.datastax.com/en/astra/aws/doc/index.html' replace: 'https://docs.datastax.com/en/astra-serverless/docs/connect/drivers/connect-python.html' - - search: 'http://cassandra.apache.org/doc/cql3/CQL-3.0.html#timeuuidFun' + - search: 'http://cassandra.apache.org/doc/cql3/CQL.html#timeuuidFun' replace: 'https://cassandra.apache.org/doc/3.11/cassandra/cql/functions.html#timeuuid-functions' - - search: 'http://cassandra.apache.org/doc/cql3/CQL-3.0.html#tokenFun' + - search: 'http://cassandra.apache.org/doc/cql3/CQL.html#tokenFun' replace: 'https://cassandra.apache.org/doc/3.11/cassandra/cql/functions.html#token' - - search: 'http://cassandra.apache.org/doc/cql3/CQL-3.0.html#collections' + - search: 'http://cassandra.apache.org/doc/cql3/CQL.html#collections' replace: 'https://cassandra.apache.org/doc/3.11/cassandra/cql/types.html#collections' - - search: 'http://cassandra.apache.org/doc/cql3/CQL-3.0.html#batchStmt' + - search: 'http://cassandra.apache.org/doc/cql3/CQL.html#batchStmt' replace: 'https://cassandra.apache.org/doc/3.11/cassandra/cql/dml.html#batch_statement' checks: external_links: From 12814064067a4b3c58f1628c67f6362e1690305e Mon Sep 17 00:00:00 2001 From: Emelia <105240296+emeliawilkinson24@users.noreply.github.com> Date: Fri, 22 Sep 2023 12:17:54 -0400 Subject: [PATCH 5/5] added CQL-3.0 rewrites docs.yaml --- docs.yaml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/docs.yaml b/docs.yaml index a4d8555ec5..7dde5a0299 100644 --- a/docs.yaml +++ b/docs.yaml @@ -89,6 +89,14 @@ rewrites: replace: 'https://cassandra.apache.org/doc/3.11/cassandra/cql/types.html#collections' - search: 'http://cassandra.apache.org/doc/cql3/CQL.html#batchStmt' replace: 'https://cassandra.apache.org/doc/3.11/cassandra/cql/dml.html#batch_statement' + - search: 'http://cassandra.apache.org/doc/cql3/CQL-3.0.html#timeuuidFun' + replace: 'https://cassandra.apache.org/doc/3.11/cassandra/cql/functions.html#timeuuid-functions' + - search: 'http://cassandra.apache.org/doc/cql3/CQL-3.0.html#tokenFun' + replace: 'https://cassandra.apache.org/doc/3.11/cassandra/cql/functions.html#token' + - search: 'http://cassandra.apache.org/doc/cql3/CQL-3.0.html#collections' + replace: 'https://cassandra.apache.org/doc/3.11/cassandra/cql/types.html#collections' + - search: 'http://cassandra.apache.org/doc/cql3/CQL-3.0.html#batchStmt' + replace: 'https://cassandra.apache.org/doc/3.11/cassandra/cql/dml.html#batch_statement' checks: external_links: exclude: