Update scripts for Data Connect Emulator v1.2.0

firebase-dataconnect/emulator/.gitignore

@@ -1,7 +1,8 @@
 .dataconnect/
-/cli*
+/cli
 /*.tools.json
 /firebase-debug.log
 /.firebase/
 /ui-debug.log
 /dataconnect-debug.log
+/cli_wrapper.sh.log.txt

firebase-dataconnect/emulator/emulator_noauth.sh → firebase-dataconnect/emulator/cli_wrapper.sh

@@ -14,19 +14,20 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+# Set the DATACONNECT_EMULATOR_BINARY_PATH environment variable to point to this file.
+# Then run: firebase emulators:start --only dataconnect
+
 set -euo pipefail
 
-readonly CLI_ARGS=(
-  ./cli
-  -logbuflevel=-1
-  -logtostderr
-  -v=9
-  dev
-  -listen=127.0.0.1:9399
-  -service_location=us-central1
-  -config_dir=dataconnect
-  -local_connection_string='postgresql://postgres:postgres@localhost:5432?sslmode=disable'
+readonly SELF_DIR="$(dirname "$0")"
+readonly LOG_FILE="${SELF_DIR}/cli_wrapper.sh.log.txt"
+readonly CLI_BINARY="${SELF_DIR}/cli"
+
+readonly args=(
+  "${CLI_BINARY}"
+  "-logtostderr"
+  "$@"
 )
 
-echo "[$0] Running command: ${CLI_ARGS[*]}"
-exec "${CLI_ARGS[@]}"
+echo "$(date) pid=$$ ${args[*]}" >>"${LOG_FILE}"
+exec "${args[@]}"

firebase-dataconnect/emulator/emulator.sh

@@ -16,12 +16,19 @@
 
 set -euo pipefail
 
+echo "[$0] PID=$$"
+
+readonly SELF_DIR="$(dirname "$0")"
+export DATACONNECT_EMULATOR_BINARY_PATH="${SELF_DIR}/cli_wrapper.sh"
+
 readonly FIREBASE_ARGS=(
-  firebase emulators:exec
-  --only auth
+  firebase
+  --debug
+  emulators:start
+  --only auth,dataconnect
   --project prjh5zbv64sv6
-  ./emulator_noauth.sh
 )
 
+echo "[$0] Set environment variable DATACONNECT_EMULATOR_BINARY_PATH=${DATACONNECT_EMULATOR_BINARY_PATH}"
 echo "[$0] Running command: ${FIREBASE_ARGS[*]}"
 exec "${FIREBASE_ARGS[@]}"

firebase-dataconnect/emulator/firebase.json

@@ -10,6 +10,9 @@
     "ui": {
       "enabled": true
     },
-    "singleProjectMode": true
+    "singleProjectMode": true,
+    "dataconnect": {
+      "port": 9399
+    }
   }
 }

firebase-dataconnect/emulator/start_postgres_pod.sh

@@ -38,7 +38,6 @@ podman \
   --rm \
   --pod dataconnect_postgres \
   -e POSTGRES_HOST_AUTH_METHOD=trust \
-  --mount "type=bind,ro,src=${SCRIPT_DIR}/postgres_dbinit.sh,dst=/docker-entrypoint-initdb.d/postgres_dbinit.sh" \
   --mount "type=volume,src=dataconnect_pgdata,dst=/var/lib/postgresql/data" \
   docker.io/library/postgres:15
 
@@ -77,7 +76,7 @@ To delete the postgresql database, run
 To delete the containers, run
   podman pod rm --force dataconnect_postgres
 
-When running the Firebase Data Connect emulator, specify this argument to use this postgresql
-or set "localConnectionString" in .firebaserc:
-  -local_connection_string='postgresql://postgres:postgres@localhost:5432?sslmode=disable'
+When running the Firebase Data Connect emulator, use this postgresql connection string
+in .firebaserc:
+  postgresql://postgres:postgres@localhost:5432?sslmode=disable
 EOF