Move terraform validators to use secrets from gcloud storage

packages/celotool/src/cmds/deploy/upgrade/vm-testnet.ts

@@ -2,9 +2,7 @@ import { UpgradeArgv } from '@celo/celotool/src/cmds/deploy/upgrade'
 import { deploy } from '@celo/celotool/src/lib/vm-testnet-utils'
 
 export const command = 'vm-testnet'
-
 export const describe = 'upgrade a testnet on a VM'
-
 export const builder = {}
 
 export const handler = async (argv: UpgradeArgv) => {

packages/celotool/src/lib/terraform.ts

@@ -1,9 +1,7 @@
+import { execCmd } from '@celo/celotool/src/lib/utils'
 import fs from 'fs'
 import path from 'path'
 
-import { generateGenesisFromEnv } from '@celo/celotool/src/lib/generate_utils'
-import { envVar, execCmd, fetchEnv } from '@celo/celotool/src/lib/utils'
-
 const terraformModulesPath = path.join(__dirname, '../../../terraform-modules')
 
 export interface TerraformVars {

packages/terraform-modules/testnet/modules/bootnode/main.tf

@@ -31,7 +31,6 @@ resource "google_compute_instance" "bootnode" {
       geth_bootnode_docker_image_repository: var.geth_bootnode_docker_image_repository,
       geth_bootnode_docker_image_tag: var.geth_bootnode_docker_image_tag,
       ip_address: google_compute_address.bootnode.address,
-      mnemonic: var.mnemonic
     }
   )
 

packages/terraform-modules/testnet/modules/bootnode/startup.sh

@@ -27,7 +27,7 @@ docker pull $CELOTOOL_DOCKER_IMAGE
 
 echo "Generating node key..."
 NODE_KEY=`docker run --rm $CELOTOOL_DOCKER_IMAGE \
-  celotooljs.sh generate bip32 --mnemonic "${mnemonic}" \
+  celotooljs.sh generate bip32 --mnemonic "this is a fake mnemonic" \
   --accountType bootnode --index 0`
 
 echo "Pulling bootnode..."

packages/terraform-modules/testnet/modules/validator/main.tf

@@ -39,13 +39,11 @@ resource "google_compute_instance" "validator" {
       gcloud_secrets_base_path: var.gcloud_secrets_base_path,
       gcloud_secrets_bucket: var.gcloud_secrets_bucket,
       genesis_content_base64: var.genesis_content_base64,
-      geth_account_secret: var.geth_account_secret,
       geth_node_docker_image_repository: var.geth_node_docker_image_repository,
       geth_node_docker_image_tag: var.geth_node_docker_image_tag,
       geth_verbosity: var.geth_verbosity,
       ip_address: google_compute_address.validator[count.index].address,
       max_peers: var.validator_count * 2,
-      mnemonic: var.mnemonic,
       network_id: var.network_id,
       rid: count.index,
       validator_name: "${var.celo_env}-validator-${count.index}",

packages/terraform-modules/testnet/modules/validator/startup.sh

@@ -12,48 +12,21 @@ systemctl start docker
 echo "Configuring Docker..."
 gcloud auth configure-docker
 
-# CELOTOOL_DOCKER_IMAGE=${celotool_docker_image_repository}:${celotool_docker_image_tag}
 GETH_NODE_DOCKER_IMAGE=${geth_node_docker_image_repository}:${geth_node_docker_image_tag}
 
+# download & apply secrets pulled from Cloud Storage as environment vars
+echo "Downloading secrets from Google Cloud Storage..."
+SECRETS_ENV_PATH=/var/.env.celo.secrets
+gsutil cp gs://${gcloud_secrets_bucket}/${gcloud_secrets_base_path}/.env.validator-${rid} $SECRETS_ENV_PATH
+# Applies the .env file
+. $SECRETS_ENV_PATH
 
-# docker pull $CELOTOOL_DOCKER_IMAGE
-#
-# echo "Pulled celotool docker image"
-# # start the celotool Docker container so we can use it for multiple commands
-# CELOTOOL_CONTAINER_ID=`docker run -td $CELOTOOL_DOCKER_IMAGE /bin/sh`
-#
-# echo "Created celotool container" $CELOTOOL_CONTAINER_ID
-#
-# celotooljs () {
-#   # NOTE(trevor): I ran into issues when using $@ directly in `docker exec`
-#   CELOTOOL_ARGS=$@
-#   docker exec $CELOTOOL_CONTAINER_ID /bin/sh -c "celotooljs.sh $CELOTOOL_ARGS"
-# }
-#
-# # Set up account
-#
-# echo "Generating private key for rid=${rid}"
-# PRIVATE_KEY=`celotooljs generate bip32 --mnemonic \"${mnemonic}\" --accountType validator --index ${rid}`
-#
-# echo "Generating address"
-# ACCOUNT_ADDRESS=`celotooljs generate account-address --private-key $PRIVATE_KEY`
-# echo "Address: $ACCOUNT_ADDRESS"
-#
-# echo "Generating Bootnode enode address for the validator:"
-# BOOTNODE_ENODE_ADDRESS=`celotooljs generate public-key --mnemonic \"${mnemonic}\" --accountType load_testing --index 0`
-# echo "Bootnode enode address: $BOOTNODE_ENODE_ADDRESS"
-
-# gsutil cp gs://${gcloud_secrets_bucket}/${gcloud_secrets_base_path}/
+echo "Address: $ACCOUNT_ADDRESS"
+echo "Bootnode enode address: $BOOTNODE_ENODE_ADDRESS"
 
 BOOTNODE_ENODE=$BOOTNODE_ENODE_ADDRESS@${bootnode_ip_address}:30301
 echo "Bootnode enode: $BOOTNODE_ENODE"
 
-# stop and remove the celotool Docker container as we no longer need it
-echo "Stopping celotool container"
-docker stop $CELOTOOL_CONTAINER_ID
-echo "Removing celotool container"
-docker rm $CELOTOOL_CONTAINER_ID
-
 docker pull $GETH_NODE_DOCKER_IMAGE
 
 echo "Starting geth...."
@@ -69,7 +42,7 @@ docker run --net=host --entrypoint /bin/sh -d $GETH_NODE_DOCKER_IMAGE -c "\
   echo -n '$ACCOUNT_ADDRESS' > /root/.celo/address && \
   echo -n '$BOOTNODE_ENODE_ADDRESS' > /root/.celo/bootnodeEnodeAddress && \
   echo -n '$BOOTNODE_ENODE' > /root/.celo/bootnodeEnode && \
-  echo -n '${geth_account_secret}' > /root/.celo/account/accountSecret && \
+  echo -n '$GETH_ACCOUNT_SECRET' > /root/.celo/account/accountSecret && \
   geth init /var/geth/genesis.json && \
   geth account import --password /root/.celo/account/accountSecret /root/.celo/pkey && \
   geth \

packages/terraform-modules/testnet/modules/validator/variables.tf

@@ -48,11 +48,6 @@ variable genesis_content_base64 {
   description = "Content of the genesis file encoded in base64"
 }
 
-variable geth_account_secret {
-  type = string
-  description = "Geth account secret"
-}
-
 variable geth_node_docker_image_repository {
   type = string
   description = "Repository of the geth docker image"
@@ -68,11 +63,6 @@ variable geth_verbosity {
   description = "Verbosity of the validator nodes"
 }
 
-variable mnemonic {
-  type = string
-  description = "Mnemonic for the validators"
-}
-
 variable network_id {
   type = number
   description = "The network ID number"

packages/terraform-modules/testnet/variables.tf

@@ -68,11 +68,6 @@ variable geth_verbosity {
   description = "Verbosity of all geth nodes"
 }
 
-variable mnemonic {
-  type = string
-  description = "Mnemonic for the nodes"
-}
-
 variable network_id {
   type = number
   description = "The network ID number"
@@ -83,11 +78,6 @@ variable validator_count {
   description = "Number of validators to create"
 }
 
-variable validator_geth_account_secret {
-  type = string
-  description = "Geth account secret for validators"
-}
-
 variable verification_pool_url {
   type = string
   description = "URL of the verification pool"