402 automate firebase resources creation v2

documentation/firebase/setup-firebase.asciidoc

@@ -33,7 +33,7 @@ setup-firebase.sh \
 ```
 -n                   [Required] Name of the project.
 -o, --output         [Required] Output path to store credentials.
--r                              Region where to create Firestore Database.
+-r                   [Required] Region where to create Firestore Database.
 --enable-maps                   Enables APIs related to Maps services.
 --setup-ios                     Enables IOS APIs and creates IOS App.
 --setup-android                 Enables Android APIs and creates Android App.
@@ -45,8 +45,8 @@ TIP: This is non-exhaustive list. Make your own combination of flags if all of t
 
 ==== Creating a project and enable Maps SDK
 [subs="attributes"]
-  ./setup-firebase.sh -n <project name> -o ./output --enable-maps
+  ./setup-firebase.sh -n <project name> -o ./output -r europe-west2 --enable-maps
 
 ==== Creating a project with ANDROID, IOS and WEB applications
 [subs="attributes"]
-  ./setup-firebase.sh -n <project name> -o ./output --setup-android --setup-ios --setup-web
+  ./setup-firebase.sh -n <project name> -o ./output -r europe-west2 --setup-android --setup-ios --setup-web

documentation/gcloud/setup-project.asciidoc

@@ -31,6 +31,7 @@ create-project.sh \
   [-d <description>] \
   [-f <folder>] \
   [-o <organization>]
+  [--firebase]
 
 ```
 
@@ -42,6 +43,7 @@ create-project.sh \
 -d               Description for the new project.
 -f               Numeric ID of the folder for which the project will be configured.
 -o               Numeric ID of the organization for which the project will be configured.
+--firebase       Creates the project as a Firebase project.
 
 
 ```

scripts/accounts/gcloud/create-project.sh

@@ -1,5 +1,24 @@
 #!/bin/bash
 
+set -e
+FLAGS=$(getopt -a --options n:d:f:o:b:h --long "help,firebase" -- "$@")
+
+eval set -- "$FLAGS"
+
+while true; do
+    case "$1" in
+         -h | --help )             help="true"; shift 1;;
+         -n )                      projectName=$2; shift 2;;
+         -d )                      description=$2; shift 2;;
+         -f )                      folder=$2; shift 2;;
+         -o )                      organization=$2; shift 2;;
+         -b )                      billing=$2; shift 2;;
+         --firebase )              firebase="true"; shift 1;;
+         --) shift; break;;
+    esac
+done
+
+
 helpFunction()
 {
    echo "Creates a new project and enables billing and required APIs"
@@ -10,25 +29,15 @@ helpFunction()
    echo -e "\t-d            Description for the new project. If not specified, name will be used as description"
    echo -e "\t-f            Numeric ID of the folder for which the project will be configured."
    echo -e "\t-o            Numeric ID of the organization for which the project will be configured."
+   echo -e "\t--firebase    Creates the project as a Firebase project."
 }
 
-while getopts "n:d:f:o:b:h" opt
-do
-   case "$opt" in
-      n ) projectName="$OPTARG" ;;
-      d ) description="$OPTARG" ;;
-      f ) folder="$OPTARG" ;;
-      o ) organization="$OPTARG" ;;
-      b ) billing="$OPTARG" ;;
-      h ) helpFunction; exit ;;
-      ? ) helpFunction ;; # Print helpFunction in case parameter is non-existent.
-   esac
-done
-
 white='\e[1;37m'
 green='\e[1;32m'
 red='\e[0;31m'
 
+if [[ "$help" == "true" ]]; then helpFunction; exit; fi
+
 # Mandatory argument check
 if [ -z "$projectName" ] || [ -z "$billing" ];
 then
@@ -44,17 +53,33 @@ if ! [ -x "$(command -v gcloud)" ]; then
   echo -ne "${white}" >&2
   exit 127
 fi
+
+# Check if Firebase CLI is installed
+if [ "$firebase" == "true" ] && ! [ -x "$(command -v firebase)" ]; then
+  echo -e "${red}Error: Firebase CLI is not installed." >&2
+  echo -ne "${white}" >&2
+  exit 127
+fi
+
 # Check if exists a Google Cloud project with that project ID. 
 if gcloud projects describe "$projectName" &>/dev/null ; then
    echo "Project ID already exists."
 else
    # Create the Google Cloud project.
    echo -e "${green}Creating project..."
    echo -ne "${white}"
-   command="gcloud projects create $projectName"
+   if [ "$firebase" == "true" ]; then
+      command="firebase projects:create $projectName --non-interactive"
+   else
+      command="gcloud projects create $projectName"
+   fi
 
    if [ -n "$description" ]; then
-      command=$command" --name=\"$description\""
+      if [ "$firebase" == "true" ]; then
+         command=$command" --display-name=\"$description\""
+      else
+         command=$command" --name=\"$description\""
+      fi
    fi
    if [ -n "$folder" ]; then
       command=$command" --folder=$folder"

scripts/accounts/gcloud/setup-firebase.sh

@@ -25,7 +25,7 @@ helpFunction() {
    echo "Arguments:"
    echo -e "\t-n                   [Required] Name of the project."
    echo -e "\t-o, --output         [Required] Output path to store credentials."
-   echo -e "\t-r                              Region where to create Firestore Database."
+   echo -e "\t-r                   [Required] Region where to create Firestore Database."
    echo -e "\t--enable-maps                   Enables APIs related to Maps services."
    echo -e "\t--setup-ios                     Enables IOS APIs and creates IOS App."
    echo -e "\t--setup-android                 Enables Android APIs and creates Android App."
@@ -41,15 +41,23 @@ checkMandatoryArguments() {
     # Project name check
     if [ -z "$projectName" ];
     then
-        echo -e "${red}Error: Missing paramenters, -n is mandatory." >&2
+        echo -e "${red}Error: Missing parameters, -n is mandatory." >&2
+        echo -e "${red}Use -h flag to display help." >&2
+        echo -ne "${white}" >&2
+        exit 2
+    fi
+    # Firestore region
+    if [ -z "$firestoreRegion" ];
+    then
+        echo -e "${red}Error: Missing parameters, -r is mandatory." >&2
         echo -e "${red}Use -h flag to display help." >&2
         echo -ne "${white}" >&2
         exit 2
     fi
     # Output path check
     if [ -z "$outputPath" ];
     then
-        echo -e "${red}Error: Missing paramenters, -o is mandatory." >&2
+        echo -e "${red}Error: Missing parameters, -o is mandatory." >&2
         echo -e "${red}Use -h flag to display help." >&2
         echo -ne "${white}" >&2
         exit 2
@@ -173,13 +181,10 @@ addFirebaseToGcloudProject() {
 
 createFirestoreDB() {
     echo "Creating Firestore Database..."
-    if [[ "$firestoreRegion" == "" ]]; then
-        firestoreRegion="europe-west6"
-    fi
-    if ! gcloud app create --region=$firestoreRegion &> /dev/null ; then
+    if ! gcloud app create --project=$projectName --region=$firestoreRegion &> /dev/null ; then
         echo -e "App Engine already created"
     fi
-    if ! gcloud firestore databases create --project $projectName --region=$firestoreRegion; then
+    if ! gcloud firestore databases create --project=$projectName --region=$firestoreRegion; then
         echo -e "${red}Error: Cannot Create Firestore Database" >&2
         echo -ne "${white}" >&2
         exit 230
@@ -188,8 +193,8 @@ createFirestoreDB() {
 
 createFirebaseSDKAccount() {
     echo "Creating Firebase SDK Service Account..."
-    service_email=$(gcloud iam service-accounts list | grep firebase-adminsdk | tr -s ' ' | cut -d ' ' -f2)
-    if ! gcloud iam service-accounts keys create $outputPath"/firebase.json" --iam-account "$service_email" --project "$projectName"; then
+    service_email=$(gcloud iam service-accounts list --project=$projectName | grep firebase-adminsdk | tr -s ' ' | cut -d ' ' -f2)
+    if ! gcloud iam service-accounts keys create $outputPath"/firebase-key.json" --iam-account "$service_email" --project="$projectName"; then
         echo -e "${red}Error: Cannot create Firebase Service Account" >&2
         echo -ne "${white}" >&2
         exit 240
@@ -212,7 +217,7 @@ setupAndroidKeystore() {
 }
 
 registerShaKeys() {
-    appId="${projectName}_android"
+    appId=$(firebase apps:list --project ${projectName} | grep ANDROID | awk '{print $4}')
     sha1Key=$(echo -e "android\n" | keytool -list -v -alias upload -keystore $outputPath"/keystore.jks" 2> /dev/null | grep SHA1 -m 1 | cut -d' ' -f3)
     sha256Key=$(echo -e "android\n" | keytool -list -v -alias upload -keystore $outputPath"/keystore.jks" 2> /dev/null | grep SHA256 -m 1 | cut -d' ' -f3)
     if ! firebase apps:android:sha:create $appId $sha1Key --project ${projectName} ; then
@@ -233,7 +238,7 @@ createPlatformApps() {
     # Remove '-' character
     packageName="com.takeoff.${projectName//-/}"
     # Remove '_' character
-    packageName="com.takeoff.${packageName//_/}"
+    packageName="${packageName//_/}"
     # ANDROID setup:
     if [[ "$setupAndroid" == "true" ]]
     then
@@ -294,6 +299,12 @@ createPlatformApps() {
     fi
 }
 
+nextSteps() {
+    echo "Next steps:"
+    echo "1. Accept consent screen: https://console.cloud.google.com/apis/credentials/consent?project=$projectName"
+    echo "2. If you want to execute quickstart frontend's script, go to https://console.cloud.google.com/google/maps-apis/api-list?project=$projectName, choose Maps Static API, then go to Credentials and copy the current secret because it will be required for next steps."
+}
+
 #==============================================================
 # SCRIPT EXECUTION:
 
@@ -319,4 +330,6 @@ if [[ "$setupWeb" == "true" ]] || [[ "$setupIOS" == "true" ]] || [[ "$setupAndro
 then
     echo "Creating APPs"
     createPlatformApps
-fi
+fi
+
+nextSteps