remove Firestore migration

Change-Id: I9fb5e4cd62c7ec54289efbdd130b7ee75feeebb4

Author: wescpy

README.md

@@ -72,20 +72,20 @@ Python 2 | Next | Python 3 | Description
 `step0-webapp2-gaendb-py2` | ⇓ | _N/A_ | Original GAE sample on GAE `ndb` & `webapp2`
 `step1-flask-gaendb-py2` | ⇓ | _N/A_ | Migrate to Flask ("gaendb" _N/A_ for Python 3)
 `step2-flask-cloudndb-py2` | ⇓ or ⇒ or ⤓* | `step2-flask-cloudndb-py3` | Migrate to Cloud NDB
-`step3-flask-datastore-py2` | ⇓ or ⇒ or ⤓+ | `step3-flask-datastore-py3` | Migrate to Cloud Datastore
-`step4-flask-firestore-py2` | ⇒ | `step4-flask-firestore-py3` | Migrate to Cloud Firestore
-`step5-flask-cloudrun-py2` | ⇒ | `step5-flask-cloudrun-py3` | Migrate to Cloud Run (with Docker)
+`step3-flask-datastore-py2` | ⇓ or ⇒ or ⤓+º | `step3-flask-datastore-py3` | Migrate to Cloud Datastore
+`step4-flask-cloudrun-py2` | ⇒ | `step4-flask-cloudrun-py3` | Migrate to Cloud Run (with Docker)
 
 ### Alternatives
 
 We recommend users complete what we consider the minimum migration (Step 2) on Gen1. If there's no further interest in upgrading Datastore access nor migrating to Python 3, users can containerize their Python 2 apps for Cloud Run immediately (see Step 2a below). Who would you consider this? If you want to keep your app mostly as-is without additional migrations and want to containerize the app to make it more portable.
 
-There are two ways to deploy containerized apps to Cloud Run, traditionally with Docker, or with the more recent [Cloud Buildpacks](https://github.com/GoogleCloudPlatform/buildpacks) (no Docker knowledge needed). Going from Step 3 to 5 uses Docker while going from Step 3 to 5a uses Cloud Buildpacks. (Step 5a is only available in Python 3.)
+There are two ways to deploy containerized apps to Cloud Run, traditionally with Docker, or with the more recent [Cloud Buildpacks](https://github.com/GoogleCloudPlatform/buildpacks) (no Docker knowledge needed). Going from Step 3 to 5 uses Docker while going from Step 3 to 5a uses Cloud Buildpacks. (Step 4a is only available in Python 3.)
 
 Python 2 | Next | Python 3 | Description
 --- | --- | --- | ---
 *`step2a-flask-cloudndb-py2-cloudrun` | _N/A_ | _N/A_ | Migrate (Python 2, Flask, Cloud NDB app) to Cloud Run (with Docker)
-_N/A_ | _N/A_ | +`step5a-flask-datastore-py3-cloudrun` | Migrate to Cloud Run (with Cloud Buildpacks)
+_N/A_ | _N/A_ | º`step3a-flask-firestore-py3` | Migrate to Cloud Firestore (uncommon)
+_N/A_ | _N/A_ | +`step4a-flask-datastore-py3-cloudrun` | Migrate to Cloud Run (with Cloud Buildpacks)
 
 ### Canonical code samples
 
@@ -97,7 +97,7 @@ Links to a more complete, canonical sample app will be provided if available. Ex
     - [Migrate from Python 2 to 3 (Gen1 to Gen2)](http://cloud.google.com/appengine/docs/standard/python/migrate-to-python3) (Steps 2-5)
     - [Migrate from App Engine NDB to Cloud NDB](http://cloud.google.com/appengine/docs/standard/python/migrate-to-python3/migrate-to-cloud-ndb) (Step 2)
     - [App Engine NDB to Cloud NDB official sample app](https://github.com/GoogleCloudPlatform/python-docs-samples/tree/master/appengine/standard/migration/ndb/overview) (Step 2)
-    - [App Engine `app.yaml` to Cloud Run `service.yaml` tool](http://googlecloudplatform.github.io/app-engine-cloud-run-converter) (Step 5a)
+    - [App Engine `app.yaml` to Cloud Run `service.yaml` tool](http://googlecloudplatform.github.io/app-engine-cloud-run-converter) (Step 4a)
     - [Migrate from App Engine `db` to `ndb`](http://cloud.google.com/appengine/docs/standard/python/ndb/db_to_ndb) (Step -1 [before Step 0])
 
 - Python App Engine

step3a-flask-firestore-py3/README.md

@@ -217,6 +217,6 @@ def fetch_visits(limit):
 
 From here, you have some flexibility as to your next move. You can...
 
-1. Migrate your app to Cloud Run (`step5-flask-cloudrun-py2`).
-1. Port your app to Python 3 (see `step4-flask-firestore-py3`)
+1. Migrate your app to Cloud Run (`step4-flask-cloudrun-py2`).
+1. Port your app to Python 3 (see `step4a-flask-firestore-py3`)
 1. Combine both of the above steps (migrate to Python 3 *and* Cloud Run; no example provided but extrapolate from above)

step5-flask-cloudrun-py2/.dockerignore step4-flask-cloudrun-py2/.dockerignorestep5-flask-cloudrun-py2/.dockerignore renamed to step4-flask-cloudrun-py2/.dockerignore

@@ -1,4 +1,4 @@
-# Step 5 - Migrate from Google App Engine to Cloud Run (with Docker)
+# Step 4 - Migrate from Google App Engine to Cloud Run (with Docker)
 
 ## Introduction
 
@@ -11,17 +11,15 @@ The next (but still optional) step of migrating from App Engine to an explicit c
 
 Regardless of whether you take this step, recognize your app is containerized anyway. If sticking with App Engine, the product hides all the container details from users so they don't need to think about containers. But those willing to trade-in some convenience for more flexibility can do so here.
 
-**NOTE:** Since migrating to Firestore is less likely for established applications with a sizeable amount of data in Datastore, this sample uses Datastore. If you have moved to Firestore, you would make a similar migration as what you did moving from Step 3 to 4.
-
 ---
 
 ## Background
 
-App Engine existed before the concept of containers. Since Docker's launch, containers have become the de facto standard in packaging applications & dependencies into a single transportable & deployable unit. Users can imagine that App Engine apps were custom containers created by Google engineers, and the migration in this step & Step 5 help users move further away from vendor lock-in and continues the messaging of Google Cloud being an open platform to its customers and offering them more flexibility than ever before.
+App Engine existed before the concept of containers. Since Docker's launch, containers have become the de facto standard in packaging applications & dependencies into a single transportable & deployable unit. Users can imagine that App Engine apps were custom containers created by Google engineers, and the migration in this step help users move further away from vendor lock-in and continues the messaging of Google Cloud being an open platform to its customers and offering them more flexibility than ever before.
 
 There are two options for users when migrating to a container, and it hinges upon what generation runtime your app is on as well as your [Docker](http://docker.com/) experience. Those on a newer runtime can use [Cloud Buildpacks](https://github.com/GoogleCloudPlatform/buildpacks) to containerize apps so they can be deployed to Cloud Run or other Google Cloud container platforms ([GCE](https://cloud.google.com/compute), [GKE](https://cloud.google.com/kubernetes-engine), [Anthos](http://cloud.google.com/anthos), etc.).
 
-See Step 5a (see `step5a-flask-datastore-py3-cloudrun`) if interested in using Buildpacks over Docker. However, if you're on a first generation runtime or prefer to use Docker, you're in the right place.
+See Step 4a (see `step4a-flask-datastore-py3-cloudrun`) if interested in using Buildpacks over Docker. However, if you're on a first generation runtime or prefer to use Docker, you're in the right place.
 
 ---
 
@@ -83,6 +81,6 @@ The main `diff`s users will encounter:
 
 1. New lines in `main.py`
 1. Old App Engine configuration files deleted
-1. A few new files (`Dockerfile`, `.dockerignore`) or (`service.yaml`, `Procfile` for Step 5a)
+1. A few new files (`Dockerfile`, `.dockerignore`) or (`service.yaml`, `Procfile` for Step 4a)
 
 If you haven't migrated to Python 3, that's your only option here, as otherwise that concludes this tutorial.