Merge pull request #1 from jeromatron/master

Updated naming and links.

Author: jeromatron

README.md

@@ -1,27 +1,27 @@
-# Loading Data into Apollo with DataStax Bulk Loader
-If you're trying to load data into Apollo from a CSV file or from an existing Cassandra table, then you've come to the right place. This example shows how to quickly load data into Apollo using the [DataStax Bulk Loader](https://docs.datastax.com/en/dsbulk/doc/index.html) (DSBulk for short).
+# Loading Data into Astra with DataStax Bulk Loader
+If you're trying to load data into Astra from a CSV file or from an existing Cassandra table, then you've come to the right place. This example shows how to quickly load data into Astra using the [DataStax Bulk Loader](https://docs.datastax.com/en/dsbulk/doc/index.html) (DSBulk for short).
 
 Contributor(s): [Dave Bechberger](https://github.com/bechbd) based on the work of [Brian Hess](https://github.com/brianmhess)
 
 ## Objectives
 
-* Show how to load data into Apollo from a CSV file on the filesystem or from an existing table in Cassandra
+* Show how to load data into Astra from a CSV file on the filesystem or from an existing table in Cassandra
 
 ## Project Layout
 
 * [data.csv](data.csv) - The CSV data to load
 * [schema.cql](schema.cql) - The CQL schema used for this example
 
 ## How this Works
-Loading data into Apollo using DSBulk is much like loading data into other Cassandra databases with the addition of the requirement to specify the [secure connect bundle](https://docs.datastax.com/en/apollo/aws/doc/dscloud/apollo/dscloudObtainingCredentials.html) as well as the username and password for your Apollo database.
+Loading data into Astra using DSBulk is much like loading data into other Cassandra databases with the addition of the requirement to specify the [secure connect bundle](https://docs.datastax.com/en/astra/aws/doc/dscloud/astra/dscloudObtainingCredentials.html) as well as the username and password for your Astra database.
 
 The secure connect bundle is specified using the `-b <INSERT PATH>` parameter on the command line. [See here for more details](https://docs.datastax.com/en/dsbulk/doc/dsbulk/reference/driverOptions.html#driverOptions__driverBasicCloudSecureConnectBundle)
 
 The username is specified using the `-u <INSERT USERNAME>` parameter on the command line.  [See here for more details](https://docs.datastax.com/en/dsbulk/doc/dsbulk/reference/driverOptions.html#driverOptions__datastaxJavaDriverAdvancedConnectionAuthProviderUsername)
 
 The password is specified using the `-p <INSERT PASSWORD>` parameter on the command line.  [See here for more details](https://docs.datastax.com/en/dsbulk/doc/dsbulk/reference/driverOptions.html#driverOptions__datastaxJavaDriverAdvancedConnectionAuthProviderPassword)
 
-This example only touches the tip of the iceberg of functionality. DSBulk has all the functionality to perform complex loading operations to Apollo as it does to other DDAC and DSE clusters. Check out the docs below for details of the other things it can do:
+This example only touches the tip of the iceberg of functionality. DSBulk has all the functionality to perform complex loading operations to Astra as it does to other DDAC and DSE clusters. Check out the docs below for details of the other things it can do:
 
 * [DataStax Bulk Loader Documentation](https://docs.datastax.com/en/dsbulk/doc/)
 * [DataStax Bulk Loader: Introduction and Loading](https://academy.datastax.com/content/datastax-bulk-loader-introduction-and-loading)
@@ -34,17 +34,17 @@ This example only touches the tip of the iceberg of functionality. DSBulk has al
 ### Prerequisites
 
 * DS Bulk v1.4.0 or greater
-* An Apollo cluster with the schema ([from schema.cql](schema.cql)) loaded and credential information
-    **Note** If you need further instruction on how to obtain the secure connect bundle for your Apollo instance then please refer to the documentation located [here](https://docs.datastax.com/en/apollo/aws/doc/dscloud/apollo/dscloudObtainingCredentials.html).
+* An Astra cluster with the schema ([from schema.cql](schema.cql)) loaded and credential information
+    **Note** If you need further instruction on how to obtain the secure connect bundle for your Astra instance then please refer to the documentation located [here](https://docs.datastax.com/en/astra/aws/doc/dscloud/astra/dscloudObtainingCredentials.html).
 * A Cassandra cluster (optional if you want to load from Cassandra)
 
 ### Running
 
-To migrate data into Apollo using DS Bulk you first need to ensure that the target Apollo keyspace has had the schema for the `video_ratings_by_user` table created.  This is done via using the DataStax Developer Studio that is embedded in your Apollo instance.  For more information on how to use the embedded Studio instance please check the documentation located [here](https://docs.datastax.com/en/apollo/aws/doc/dscloud/apollo/dscloudConnectStudio.html).
+To migrate data into Astra using DS Bulk you first need to ensure that the target Astra keyspace has had the schema for the `video_ratings_by_user` table created.  This is done via using the DataStax Developer Studio that is embedded in your Astra instance.  For more information on how to use the embedded Studio instance please check the documentation located [here](https://docs.datastax.com/en/astra/aws/doc/dscloud/astra/dscloudConnectStudio.html).
 
 #### Loading from CSV
 
-Here is an example command that will load the data.csv file into the `video_ratings_by_user` table in your Apollo instance.
+Here is an example command that will load the data.csv file into the `video_ratings_by_user` table in your Astra instance.
 
 **Note** This loads the data from the file stored in the github repo so the machine running this command will need access to the internet.
 
@@ -54,18 +54,18 @@ Here is an example command that will load the data.csv file into the `video_rati
 
 #### Loading from an existing Cassandra table
 
-To load data from an existing table in a Cassandra keyspace into Apollo there are two options to accomplish this.
+To load data from an existing table in a Cassandra keyspace into Astra there are two options to accomplish this.
 
 ##### Option 1 - Unload and Load in Separate Steps
-The first option for loading data from an existing Cassandra cluster into Apollo requires that you unload the data from the Cassandra cluster into a local file and then load the data into Apollo.  The commands to accomplish this look like this:
+The first option for loading data from an existing Cassandra cluster into Astra requires that you unload the data from the Cassandra cluster into a local file and then load the data into Astra.  The commands to accomplish this look like this:
 
 ```
 ./dsbulk unload -h <CASSANDRA CLUSTER IP> -k <KEYSPACE NAME> -t video_ratings_by_user -url /path/to/file/migrate.csv
 ./dsbulk load -url /path/to/file/migrate.csv -b /path/to/bundle.zip -k <KEYSPACE NAME> -t video_ratings_by_user -u <USERNAME> -p <PASSWORD>
 ```
 
 ##### Option 2 - Unload and Load by Chaining Steps
-The second option for loading data from an existing Cassandra cluster into Apollo requires that you unload the data from the Cassandra cluster and pipe that into a command load the data into Apollo.  This has some advantages as it will run in a single command but it will only run single threaded as it uses stdin/stdout. The commands to accomplish this look like this:
+The second option for loading data from an existing Cassandra cluster into Astra requires that you unload the data from the Cassandra cluster and pipe that into a command load the data into Astra.  This has some advantages as it will run in a single command but it will only run single threaded as it uses stdin/stdout. The commands to accomplish this look like this:
 
 ```
 ./dsbulk unload -h <CASSANDRA CLUSTER IP> -k <KEYSPACE NAME> -t video_ratings_by_user -url /path/to/file/migrate.csv | ./dsbulk load -url /path/to/file/migrate.csv -b /path/to/bundle.zip -k <KEYSPACE NAME> -t video_ratings_by_user -u <USERNAME> -p <PASSWORD>