Clean up

packages/celotool/src/cmds/deploy/upgrade/blockscout.ts

@@ -4,7 +4,7 @@ import sleep from 'sleep-promise'
 import { installHelmChart, removeHelmRelease, upgradeHelmChart } from 'src/lib/blockscout'
 import { switchToClusterFromEnv } from 'src/lib/cluster'
 import { resetCloudSQLInstance, retrieveCloudSQLConnectionInfo } from 'src/lib/helm_deploy'
-import { execCmd } from 'src/lib/utils'
+import { execCmdWithExitOnFailure } from 'src/lib/utils'
 import * as yargs from 'yargs'
 
 export const command = 'blockscout'
@@ -53,7 +53,9 @@ export const handler = async (argv: BlockscoutUpgradeArgv) => {
   } else {
     console.info(`Delete blockscout-migration`)
     try {
-      await execCmd(`kubectl delete job ${argv.celoEnv}-blockscout-migration -n ${argv.celoEnv}`)
+      await execCmdWithExitOnFailure(
+        `kubectl delete job ${argv.celoEnv}-blockscout-migration -n ${argv.celoEnv}`
+      )
     } catch (error) {
       console.error(error)
     }

packages/celotool/src/lib/terraform.ts

@@ -15,8 +15,6 @@ export async function initTerraformModule(
   vars: TerraformVars,
   backendConfigVars: TerraformVars
 ) {
-  console.info('Resetting local state to force pull remote backend...')
-  await resetLocalTerraformState()
   const modulePath = getModulePath(moduleName)
   return execTerraformCmd(
     'init',
@@ -57,6 +55,11 @@ export function destroyTerraformModule(moduleName: string, vars: TerraformVars)
   return execTerraformCmd('destroy', getModulePath(moduleName), getVarOptions(vars), '-force')
 }
 
+// pulls remote state
+function refreshTerraformModule(moduleName: string, vars: TerraformVars) {
+  return execTerraformCmd('refresh', getModulePath(moduleName), getVarOptions(vars))
+}
+
 // This is a workaround to `terraform output` requiring users to run it from
 // inside the Terraform module directory. See:
 // https://github.com/hashicorp/terraform/issues/15581
@@ -66,29 +69,11 @@ export async function getTerraformModuleOutputs(
   vars: TerraformVars,
   backendConfigVars: TerraformVars
 ) {
-  // console.info('Resetting local state to force pull remote backend...')
-  // await resetLocalTerraformState()
-
-  const initCmd = buildTerraformCmd(
-    'init',
-    getModulePath(moduleName),
-    getVarOptions(vars),
-    getVarOptions(backendConfigVars, 'backend-config')
-  )
-
-  const refreshCmd = buildTerraformCmd('refresh', getModulePath(moduleName), getVarOptions(vars))
-  const [stdout] = await execCmd(`
-    cd ${getModulePath(moduleName)} && \
-    ${initCmd} > /dev/null 2>&1 && \
-    ${refreshCmd} > /dev/null 2>&1 && \
-    terraform output -json
-  `)
-  console.log(stdout)
-  return JSON.parse(stdout)
-}
-
-function resetLocalTerraformState() {
-  // return execCmd('rm -f ./.terraform/terraform.tfstate')
+  await initTerraformModule(moduleName, vars, backendConfigVars)
+  await refreshTerraformModule(moduleName, vars)
+  const modulePath = getModulePath(moduleName)
+  const [output] = await execCmd(`cd ${modulePath} && terraform output -json`)
+  return JSON.parse(output)
 }
 
 function getModulePath(moduleName: string) {
@@ -122,7 +107,7 @@ function execTerraformCmd(
   return execCmd(`cd ${modulePath} && ${terraformCmd}`, {}, false, true)
 }
 
-function buildTerraformCmd(command: string, actionPath: string, ...options: string[]) {
+function buildTerraformCmd(command: string, cmdPath: string, ...options: string[]) {
   const optionsStr = options ? options.join(' ') : ''
-  return `terraform ${command} -input=false ${optionsStr} ${actionPath}`
+  return `terraform ${command} -input=false ${optionsStr} ${cmdPath}`
 }

packages/celotool/src/lib/vm-testnet-utils.ts

@@ -167,6 +167,13 @@ function getTestnetVars(celoEnv: string) {
   }
 }
 
+function getTestnetNetworkVars(celoEnv: string) {
+  return {
+    ...getEnvVarValues(testnetNetworkEnvVars),
+    network_name: networkName(celoEnv),
+  }
+}
+
 function getEnvVarValues(terraformEnvVars: TerraformVars) {
   const vars: { [key: string]: string } = {}
   for (const key of Object.keys(terraformEnvVars)) {
@@ -175,13 +182,6 @@ function getEnvVarValues(terraformEnvVars: TerraformVars) {
   return vars
 }
 
-function getTestnetNetworkVars(celoEnv: string) {
-  return {
-    ...getEnvVarValues(testnetNetworkEnvVars),
-    network_name: networkName(celoEnv),
-  }
-}
-
 export async function generateAndUploadSecrets(celoEnv: string) {
   // Bootnode
   const bootnodeSecrets = generateBootnodeSecretEnvVars()