net/ can now deploy Snaps

net/init-metrics.sh

@@ -11,20 +11,18 @@ usage() {
     echo "Error: $*"
   fi
   cat <<EOF
-usage: $0 [-d] [username] [optional database name]
+usage: $0 [-d] [username]
 
 Creates a testnet dev metrics database
 
   username        InfluxDB user with access to create a new database
-  database        Uncommon.  Optional database suffix to follow the mandiatory
-                  'testnet-dev-[username]' database name prefix
-
   -d              Delete the database instead of creating it
 
 EOF
   exit $exitcode
 }
 
+loadConfigFile
 
 delete=false
 while getopts "hd" opt; do
@@ -34,7 +32,7 @@ while getopts "hd" opt; do
     exit 0
     ;;
   d)
-    delete=true;
+    delete=true
     ;;
   *)
     usage "Error: unhandled option: $opt"
@@ -45,11 +43,6 @@ shift $((OPTIND - 1))
 
 username=$1
 [[ -n "$username" ]] || usage "username not specified"
-database="testnet-dev-$username"
-
-if [[ -n "$2" ]]; then
-  database="$database-$2"
-fi
 
 read -rs -p "InfluxDB password for $username: " password
 [[ -n $password ]] || { echo "Password not specified"; exit 1; }
@@ -62,15 +55,15 @@ query() {
     --data-urlencode "q=$*"
 }
 
-query "DROP DATABASE \"$database\""
+query "DROP DATABASE \"$netBasename\""
 ! $delete || exit 0
-query "CREATE DATABASE \"$database\""
-query "ALTER RETENTION POLICY autogen ON \"$database\" DURATION 7d"
-query "GRANT READ ON \"$database\" TO \"ro\""
-query "GRANT WRITE ON \"$database\" TO \"scratch_writer\""
+query "CREATE DATABASE \"$netBasename\""
+query "ALTER RETENTION POLICY autogen ON \"$netBasename\" DURATION 7d"
+query "GRANT READ ON \"$netBasename\" TO \"ro\""
+query "GRANT WRITE ON \"$netBasename\" TO \"scratch_writer\""
 
 echo "export \
-  SOLANA_METRICS_CONFIG=\"db=$database,u=scratch_writer,p=topsecret\" \
+  SOLANA_METRICS_CONFIG=\"db=$netBasename,u=scratch_writer,p=topsecret\" \
 " >> "$configFile"
 
 exit 0