Rebrand to Astra

msmygit · msmygit · commit 104f92c83753 · 2020-05-06T14:53:11.000-04:00
diff --git a/README.md b/README.md
@@ -1,17 +1,19 @@
-# Getting Started with Apollo - Python backend
+# Getting Started with Astra - Python backend
 
-This sample Python backend provides a REST API service that is used with the [Getting Started with Apollo UI](https://github.com/DataStax-Examples/getting-started-with-apollo-ui) to show a
-simple example of how to connect to and query DataStax Apollo databases.
+This sample Python backend provides a REST API service that is used with the [Getting Started with Astra UI](https://github.com/DataStax-Examples/getting-started-with-astra-ui) to show a
+simple example of how to connect to and query DataStax Astra databases.
 
-Contributor(s): [Chris Splinter](https://github.com/csplinter)
+Contributor(s):
+* [Chris Splinter](https://github.com/csplinter)
+* [Madhavan Sridharan](https://github.com/msmygit)
 
 ## Objectives
-- How to connect to DataStax Apollo using the secure connect bundle
+- How to connect to DataStax Astra using the secure connect bundle
 - How to share a DataStax Driver Session throughout a Python application
 - How to expose a basic REST API using the DataStax Driver
 
 ## Project Layout
-- [getting_started_with_apollo.py](getting_started_with_apollo.py) - entrypoint for the backend, registers controller blueprints with Flask app
+- [getting_started_with_astra.py](getting_started_with_astra.py) - entrypoint for the backend, registers controller blueprints with Flask app
 - [schema.cql](schema.cql) - database schema used by the application
 - [service](service/) - acts as the middle-man to take requests from the controllers and calls the corresponding dao methods.
 Note how this and [session_manager.py](dao/session_manager.py) are used to share a single DataStax Driver Session across API requests, this is a best practice.
@@ -20,9 +22,9 @@ Note how this and [session_manager.py](dao/session_manager.py) are used to share
 - [controller](controller/) - defines the API endpoints using Flask decorators
 
 ## How this works
-This project is built in Python and uses Flask to expose a REST API backend for use with the [Getting Started with Apollo UI](https://github.com/DataStax-Examples/getting-started-with-apollo-ui).
+This project is built in Python and uses Flask to expose a REST API backend for use with the [Getting Started with Astra UI](https://github.com/DataStax-Examples/getting-started-with-astra-ui).
 
-This application is the middle man that receives requests from the UI web page and serves data from the underlying DataStax Apollo database.
+This application is the middle man that receives requests from the UI web page and serves data from the underlying DataStax Astra database.
 
 ## Setup & Running
 
@@ -31,7 +33,7 @@ If you are familiar with Python, then you've likely gotten your hands on Python
 We'll be leveraging pyenv while setting up this backend, which will serve our
 Spacecraft frontend that will have you flying through the stars.
 
-If you aren't familiar with Python, hop over to our [official documentation](https://helpdocs.datastax.com/aws/dscloud/apollo/dscloudPythonDriver.html#Installingpyenv,Python,andvirtualenv)
+If you aren't familiar with Python, hop over to our [official documentation](https://helpdocs.datastax.com/aws/dscloud/astra/dscloudPythonDriver.html#Installingpyenv,Python,andvirtualenv)
 for setting that up on your machine, and come back here after you have it installed ( specifically after Step 5 of the Procedure ).
 
 Now that we have that out of the way, we'll use pyenv to install Python 3.6.9
@@ -42,13 +44,13 @@ pyenv install 3.6.9
 Next create a new virtualenv using that Python version we just installed.
 
 ```
-pyenv virtualenv 3.6.9 apollo-venv
+pyenv virtualenv 3.6.9 astra-venv
 ```
 
 Almost off to the races, go ahead and activate that virtualenv
 
 ```
-pyenv activate apollo-venv
+pyenv activate astra-venv
 ```
 
 Woot, now 3 quick dependencies ( Flask, Flask CORS,  and the DataStax Cassandra Driver )
@@ -60,25 +62,25 @@ pip install Flask flask-cors cassandra-driver
 Last one, clone this repo
 ```
 git clone https://github.com/DataStax-Examples
-/getting-started-with-apollo-python.git
+/getting-started-with-astra-python.git
 ```
 
 ### Running
 
 If everything above went smoothly, fingers crossed, then we are ready to rock.
 Go to the directory that you just cloned this repo into
 ```
-cd getting-started-with-apollo-python
+cd getting-started-with-astra-python
 ```
 
 Fire up the engines
 ```
-FLASK_ENV=development FLASK_APP=getting_started_with_apollo.py flask run
+FLASK_ENV=development FLASK_APP=getting_started_with_astra.py flask run
 ```
 
 You should be met with the following output, note that it's running on `localhost` and port `5000`
 ```
- * Serving Flask app "getting_started_with_apollo.py" (lazy loading)
+ * Serving Flask app "getting_started_with_astra.py" (lazy loading)
  * Environment: development
  * Debug mode: on
  * Running on http://127.0.0.1:5000/ (Press CTRL+C to quit)
@@ -87,4 +89,4 @@ You should be met with the following output, note that it's running on `localhos
  * Debugger PIN: 204-527-831
 ```
 
-Once the backend is running, you can start the [Getting Started with Apollo UI](https://github.com/DataStax-Examples/getting-started-with-apollo-ui) in order to use a web page that leverages this backend.
+Once the backend is running, you can start the [Getting Started with Astra UI](https://github.com/DataStax-Examples/getting-started-with-astra-ui) in order to use a web page that leverages this backend.
diff --git a/controller/credentials_controller.py b/controller/credentials_controller.py
@@ -2,7 +2,7 @@
 from flask import Blueprint, request
 from flask_cors import CORS
 
-from service.apollo_service import apollo_service
+from service.astra_service import astra_service
 
 credentials_controller = Blueprint('credentials_controller', __name__)
 
@@ -11,7 +11,7 @@
 
 # This controller handles the functionality for connecting to the database
 #
-# Here we define the REST API endpoints and call our Apollo Service
+# Here we define the REST API endpoints and call our Astra Service
 # to send the request to the underlying Data Access Objects
 @credentials_controller.route("/api/credentials", methods=['GET', 'POST'])
 def connect():
@@ -22,17 +22,17 @@ def connect():
             f.write(request.get_data())
 
         try:
-            apollo_service.save_credentials(request.args['username'], request.args['password'],
+            astra_service.save_credentials(request.args['username'], request.args['password'],
                                             request.args['keyspace'], temp_zip_path)
-            apollo_service.connect()
+            astra_service.connect()
         finally:
             os.remove(temp_zip_path)
 
         return {'connected': True}, 200
 
     if request.method == 'GET':
 
-        resp = apollo_service.check_connection()
+        resp = astra_service.check_connection()
 
         if resp is True:
             status_code = 200
@@ -54,7 +54,7 @@ def test_credentials():
     status_code = 400
 
     try:
-        test_connection = apollo_service.test_credentials(request.args['username'], request.args['password'],
+        test_connection = astra_service.test_credentials(request.args['username'], request.args['password'],
                                                           request.args['keyspace'], temp_zip_path)
         resp = {'success': test_connection}
         if resp['success'] is True:
diff --git a/controller/spacecraft_instruments_controller.py b/controller/spacecraft_instruments_controller.py
@@ -2,7 +2,7 @@
 from flask import Blueprint, request
 from flask_cors import CORS
 
-from service.apollo_service import apollo_service
+from service.astra_service import astra_service
 
 spacecraft_instruments_controller = Blueprint('spacecraft_instruments_controller', __name__)
 
@@ -15,17 +15,17 @@
 #     spacecraft_speed_over_time
 #     spacecraft_temperature_over_time
 #
-# Here we define the REST API endpoints and call our Apollo Service
+# Here we define the REST API endpoints and call our Astra Service
 # to send the request to the underlying Data Access Objects
 @spacecraft_instruments_controller.route('/api/spacecraft/<spacecraft_name>/<journey_id>/instruments/location',
                                          methods=['GET', 'POST'])
 def location_reading_for_spacecraft_journey(spacecraft_name, journey_id):
     if request.method == 'POST':
-        apollo_service.save_location_reading_for_spacecraft_journey(spacecraft_name, journey_id, request.get_json())
+        astra_service.save_location_reading_for_spacecraft_journey(spacecraft_name, journey_id, request.get_json())
         return {'success': True}, 200
 
     if request.method == 'GET':
-        result = apollo_service.get_location_readings_for_spacecraft_journey(spacecraft_name, journey_id,
+        result = astra_service.get_location_readings_for_spacecraft_journey(spacecraft_name, journey_id,
                                                                              request.args.get('pagesize', 25),
                                                                              request.args.get('pagestate', None))
 
@@ -40,11 +40,11 @@ def location_reading_for_spacecraft_journey(spacecraft_name, journey_id):
                                          methods=['GET', 'POST'])
 def pressure_reading_for_spacecraft_journey(spacecraft_name, journey_id):
     if request.method == 'POST':
-        apollo_service.save_pressure_reading_for_spacecraft_journey(spacecraft_name, journey_id, request.get_json())
+        astra_service.save_pressure_reading_for_spacecraft_journey(spacecraft_name, journey_id, request.get_json())
         return {'success': True}, 200
 
     if request.method == 'GET':
-        result = apollo_service.get_pressure_readings_for_spacecraft_journey(spacecraft_name, journey_id,
+        result = astra_service.get_pressure_readings_for_spacecraft_journey(spacecraft_name, journey_id,
                                                                              request.args.get('pagesize', 25),
                                                                              request.args.get('pagestate', None))
 
@@ -59,11 +59,11 @@ def pressure_reading_for_spacecraft_journey(spacecraft_name, journey_id):
                                          methods=['GET', 'POST'])
 def speed_reading_for_spacecraft_journey(spacecraft_name, journey_id):
     if request.method == 'POST':
-        apollo_service.save_speed_reading_for_spacecraft_journey(spacecraft_name, journey_id, request.get_json())
+        astra_service.save_speed_reading_for_spacecraft_journey(spacecraft_name, journey_id, request.get_json())
         return {'success': True}, 200
 
     if request.method == 'GET':
-        result = apollo_service.get_speed_readings_for_spacecraft_journey(spacecraft_name, journey_id,
+        result = astra_service.get_speed_readings_for_spacecraft_journey(spacecraft_name, journey_id,
                                                                           request.args.get('pagesize', 25),
                                                                           request.args.get('pagestate', None))
 
@@ -78,11 +78,11 @@ def speed_reading_for_spacecraft_journey(spacecraft_name, journey_id):
                                          methods=['GET', 'POST'])
 def temperature_reading_for_spacecraft_journey(spacecraft_name, journey_id):
     if request.method == 'POST':
-        apollo_service.save_temperature_reading_for_spacecraft_journey(spacecraft_name, journey_id, request.get_json())
+        astra_service.save_temperature_reading_for_spacecraft_journey(spacecraft_name, journey_id, request.get_json())
         return {'success': True}, 200
 
     if request.method == 'GET':
-        result = apollo_service.get_temperature_readings_for_spacecraft_journey(spacecraft_name, journey_id,
+        result = astra_service.get_temperature_readings_for_spacecraft_journey(spacecraft_name, journey_id,
                                                                                 request.args.get('pagesize', 25),
                                                                                 request.args.get('pagestate', None))
 
diff --git a/controller/spacecraft_journey_controller.py b/controller/spacecraft_journey_controller.py
@@ -2,7 +2,7 @@
 from flask_cors import CORS
 from cassandra.util import min_uuid_from_time
 from datetime import datetime, timedelta
-from service.apollo_service import apollo_service
+from service.astra_service import astra_service
 
 spacecraft_journey_controller = Blueprint('spacecraft_journey_controller', __name__)
 
@@ -11,11 +11,11 @@
 
 # This controller handles the all of the GET and POST REST API calls for the spacecraft_journey_catalog table
 #
-# Here we define the REST API endpoints and call our Apollo Service
+# Here we define the REST API endpoints and call our Astra Service
 # to send the request to the underlying Data Access Objects
 @spacecraft_journey_controller.route('/api/spacecraft')
 def get_all_journeys():
-    result = apollo_service.get_all_spacecraft_journeys()
+    result = astra_service.get_all_spacecraft_journeys()
     return jsonify(result.current_rows), 200
 
 
@@ -29,12 +29,12 @@ def journeys_for_spacecraft(spacecraft_name):
         active = True
         summary = request.get_data(as_text=True)
 
-        apollo_service.create_new_journey_for_spacecraft(spacecraft_name, journey_id, start, end, active, summary)
+        astra_service.create_new_journey_for_spacecraft(spacecraft_name, journey_id, start, end, active, summary)
 
         return str(journey_id), 200
 
     if request.method == 'GET':
-        result = apollo_service.get_all_journeys_for_spacecraft(spacecraft_name)
+        result = astra_service.get_all_journeys_for_spacecraft(spacecraft_name)
 
         return jsonify(result.current_rows), 200
 
diff --git a/dao/session_manager.py b/dao/session_manager.py
@@ -39,14 +39,14 @@ def test_credentials(self, username, password, keyspace, secure_connection_bundl
         temp_session = None
         success = False
         try:
-            # This is how you use the Apollo secure connect bundle to connect to an Apollo database
+            # This is how you use the Astra secure connect bundle to connect to an Astra database
             # note that the database username and password required.
             # note that no contact points or any other driver customization is required.
-            apollo_config = {
+            astra_config = {
                 'secure_connect_bundle': secure_connection_bundle_path
             }
 
-            cluster = Cluster(cloud=apollo_config, auth_provider=PlainTextAuthProvider(username, password))
+            cluster = Cluster(cloud=astra_config, auth_provider=PlainTextAuthProvider(username, password))
 
             temp_session = cluster.connect(keyspace=keyspace)
             result = temp_session.execute(self.ping_query)
@@ -63,14 +63,14 @@ def connect(self):
             raise Exception('Please initialize the connection parameters first with SessionManager.save_credentials')
 
         if self._session is None:
-            # This is how you use the Apollo secure connect bundle to connect to an Apollo database
+            # This is how you use the Astra secure connect bundle to connect to an Astra database
             # note that the database username and password required.
             # note that no contact points or any other driver customization is required.
-            apollo_config = {
+            astra_config = {
                 'secure_connect_bundle': self.secure_connect_bundle_path
             }
 
-            cluster = Cluster(cloud=apollo_config, auth_provider=PlainTextAuthProvider(self.username, self.password))
+            cluster = Cluster(cloud=astra_config, auth_provider=PlainTextAuthProvider(self.username, self.password))
             self._session = cluster.connect(keyspace=self.keyspace)
 
             # have the driver return results as dict
diff --git a/getting_started_with_astra.py b/getting_started_with_astra.py
diff --git a/service/astra_service.py b/service/astra_service.py
@@ -6,7 +6,7 @@
 from dao.spacecraft_temperature_dao import SpacecraftTemperatureDAO
 
 
-class ApolloService(object):
+class AstraService(object):
 
     spacecraft_journey_catalog_dao = None
     spacecraft_location_dao = None
@@ -106,4 +106,4 @@ def save_temperature_reading_for_spacecraft_journey(self, spacecraft_name, journ
         self.get_spacecraft_temperature_dao().write_readings(spacecraft_name, journey_id, data)
 
 
-apollo_service = ApolloService()
+astra_service = AstraService()
