[BENCH-1412] Remove verily server config from DSP/terra-cli (#550)

.github/workflows/release-on-pr-merge.yml

@@ -45,9 +45,6 @@ jobs:
     - name: Update client credentials
       run: |
         ./tools/client-credentials.sh "src/main/resources/broad_secret.json" ${{ secrets.BROAD_CLIENT_ID }} ${{ secrets.BROAD_CLIENT_SECRET }}
-        ./tools/client-credentials.sh "src/main/resources/verily_secret.json" ${{ secrets.VERILY_CLIENT_ID }} ${{ secrets.VERILY_CLIENT_SECRET }}
-        ./tools/client-credentials.sh "src/main/resources/verily_auth0_dev_secret.json" ${{ secrets.VERILY_AUTH0_DEV_CLIENT_ID }} ${{ secrets.VERILY_AUTH0_DEV_CLIENT_SECRET }}
-        ./tools/client-credentials.sh "src/main/resources/verily_auth0_prod_secret.json" ${{ secrets.VERILY_AUTH0_PROD_CLIENT_ID }} ${{ secrets.VERILY_AUTH0_PROD_CLIENT_SECRET }}
 
     - name: Bump tag and build version
       id: bump_tag

ADMIN.md

@@ -146,7 +146,7 @@ the `broad-dev-cli-testing` deployment:
 ```shell
 ./tools/render-config.sh
 terra auth login # login as yourself, the break-glass granter
-terra workspace break-glass [email protected] --big-query-project=terra-cli-dev --big-query-sa=rendered/broad/ci-account.json --user-project-admin-sa=rendered/broad/verilycli-wsm-sa.json --notes="Testing break-glass command."
+terra workspace break-glass [email protected] --big-query-project=terra-cli-dev --big-query-sa=rendered/broad/ci-account.json --user-project-admin-sa=rendered/broad/wsm-sa.json --notes="Testing break-glass command."
 ```
 
 ### Requests catalog

gradle/testing.gradle

@@ -142,7 +142,7 @@ task runTestsWithTag(type: Test) {
         environment 'TERRA_CONTEXT_PARENT_DIR', project.findProperty('contextDir')
     }
 
-    // specify the server to run tests against (e.g. -Pserver=verily-devel). defaults to 'broad-dev'
+    // specify the server to run tests against (e.g. -Pserver=broad-dev-cli-testing). defaults to 'broad-dev'
     String terraServer = project.hasProperty('server') ? project.findProperty('server') : 'broad-dev'
     environment 'TERRA_SERVER', terraServer
 

src/main/resources/servers/all-servers.json

@@ -3,13 +3,5 @@
   "broad-dev-cli-testing.json",
   "broad-dev-local-wsm.json",
   "broad-dev-local-sam.json",
-  "broad-dev-mmedlock.json",
-  "broad-dev-zloery.json",
-  "broad-wsmtest.json",
-  "verily.json",
-  "verily-autopush.json",
-  "verily-devel.json",
-  "verily-mc-feature-dev.json",
-  "verily-preprod.json",
-  "verily-staging.json"
+  "broad-wsmtest.json"
 ]

src/test/java/unit/Config.java

@@ -69,19 +69,19 @@ void server() throws IOException {
     // It's fine that this test hard-codes server names. We're just testing server configuration is
     // saved correctly; we're not actually making calls to the server.
 
-    // `terra server set --name=verily-devel`
-    TestCommand.runCommandExpectSuccess("server", "set", "--name=verily-devel", "--quiet");
+    // `terra server set --name=broad-dev-cli-testing`
+    TestCommand.runCommandExpectSuccess("server", "set", "--name=broad-dev-cli-testing", "--quiet");
 
     // `terra config get server`
     UFServer getValue =
         TestCommand.runAndParseCommandExpectSuccess(UFServer.class, "config", "get", "server");
-    assertEquals("verily-devel", getValue.name, "server set affects config get");
+    assertEquals("broad-dev-cli-testing", getValue.name, "server set affects config get");
 
     // `terra config list`
     List<HashMap> configItemList =
         TestCommand.runAndParseCommandExpectSuccess(ArrayList.class, "config", "list");
     assertEquals(
-        "verily-devel",
+        "broad-dev-cli-testing",
         getTableFormatValue(configItemList, "server"),
         "server set affects config list");
 

src/test/java/unit/MountControllerTest.java

@@ -96,21 +96,21 @@ public void setUpTest() {
     when(resource1.getName()).thenReturn("bucket-1");
     when(resource1.getResourceType()).thenReturn(Resource.Type.GCS_BUCKET);
     when(resource1.getStewardshipType()).thenReturn(StewardshipType.CONTROLLED);
-    when(resource1.getCreatedBy()).thenReturn("johny.appleseed@verily.com");
+    when(resource1.getCreatedBy()).thenReturn("johny.appleseed@email.com");
 
     resource2 = mock(Resource.class);
     when(resource2.getName()).thenReturn("bucket-2");
     when(resource2.getResourceType()).thenReturn(Resource.Type.GCS_BUCKET);
     when(resource2.getStewardshipType()).thenReturn(StewardshipType.CONTROLLED);
-    when(resource2.getCreatedBy()).thenReturn("bonny.bananabead@verily.com");
+    when(resource2.getCreatedBy()).thenReturn("bonny.bananabead@email.com");
 
     workspace = mock(Workspace.class);
     when(workspace.listResources()).thenReturn(List.of(resource1, resource2));
     when(workspace.getResource(resource1.getName())).thenReturn(resource1);
     when(workspace.getResource(resource2.getName())).thenReturn(resource2);
 
     user = mock(User.class);
-    when(user.getEmail()).thenReturn("johny.appleseed@verily.com");
+    when(user.getEmail()).thenReturn("johny.appleseed@email.com");
 
     mountHandler1 = mock(GcsFuseMountHandler.class);
     mountHandler2 = mock(GcsFuseMountHandler.class);

src/test/java/unit/Server.java

@@ -48,7 +48,7 @@ void serverStatusSucceeds() throws JsonProcessingException {
   @DisplayName("status, server list reflect server set")
   void statusListReflectSet() throws JsonProcessingException {
     // `terra server set --name=$serverName1`
-    String serverName1 = "verily-devel";
+    String serverName1 = "broad-dev-cli-testing";
     TestCommand.runCommandExpectSuccess("server", "set", "--name=" + serverName1, "--quiet");
 
     // `terra status`

tools/render-config.sh

@@ -21,7 +21,6 @@ TEST_USER_SA_VAULT_PATH=secret/dsde/firecloud/dev/common/firecloud-account.json
 TEST_USERS_VAULT_PATH=secret/dsde/terra/cli-test/test-users
 EXT_PROJECT_SA_VAULT_PATH=secret/dsde/terra/cli-test/default/service-account-admin.json
 JANITOR_CLIENT_SA_VAULT_PATH=secret/dsde/terra/kernel/integration/tools/crl_janitor/client-sa
-VERILYCLI_WSM_SA_VAULT_PATH=secret/dsde/terra/kernel/integration/verilycli/workspace/app-sa
 CLIENT_CRED_VAULT_PATH=secret/dsde/terra/cli/oauth-client-credentials
 
 # Helper function to read a secret from Vault and write it to a local file in the rendered/broad/ directory.
@@ -66,9 +65,9 @@ readFromVault "${EXT_PROJECT_SA_VAULT_PATH}" "external-project-account.json"
 echo "Reading the Janitor client service account key file from Vault"
 readFromVault "${JANITOR_CLIENT_SA_VAULT_PATH}" "janitor-client.json" "base64"
 
-# used for granting break-glass access to a workspace in the verilycli deployment
-echo "Reading the WSM app service account key file for the verilycli deployment from Vault"
-readFromVault "${VERILYCLI_WSM_SA_VAULT_PATH}" "verilycli-wsm-sa.json" "base64"
+# used for granting break-glass access to a workspace
+# echo "Reading the WSM app service account key file from Vault"
+# readFromVault "${WSM_SA_VAULT_PATH}" "wsm-sa.json" "base64"
 
 # Read test user refresh tokens
 echo "Reading test user refresh tokens from Vault"
@@ -86,33 +85,3 @@ clientSecret=$(docker run --rm -e VAULT_TOKEN="${VAULT_TOKEN}" "${DSDE_TOOLBOX_D
             jq -r '.data."broad-client-secret"')
 ./tools/client-credentials.sh "src/main/resources/broad_secret.json" "${clientId}" "${clientSecret}" \
                               "rendered/broad_secret.json"
-
-echo "Fetching Verily client id and client secrets"
-clientId=$(docker run --rm -e VAULT_TOKEN="${VAULT_TOKEN}" "${DSDE_TOOLBOX_DOCKER_IMAGE}" \
-            vault read -format json "${CLIENT_CRED_VAULT_PATH}" | \
-            jq -r '.data."verily-client-id"')
-clientSecret=$(docker run --rm -e VAULT_TOKEN="${VAULT_TOKEN}" "${DSDE_TOOLBOX_DOCKER_IMAGE}" \
-            vault read -format json "${CLIENT_CRED_VAULT_PATH}" | \
-            jq -r '.data."verily-client-secret"')
-./tools/client-credentials.sh "src/main/resources/verily_secret.json" "${clientId}" "${clientSecret}" \
-                              "rendered/verily_secret.json"
-
-echo "Fetching Verily auth0 dev client id and client secrets"
-clientId=$(docker run --rm -e VAULT_TOKEN="${VAULT_TOKEN}" "${DSDE_TOOLBOX_DOCKER_IMAGE}" \
-            vault read -format json "${CLIENT_CRED_VAULT_PATH}" | \
-            jq -r '.data."verily-auth0-dev-client-id"')
-clientSecret=$(docker run --rm -e VAULT_TOKEN="${VAULT_TOKEN}" "${DSDE_TOOLBOX_DOCKER_IMAGE}" \
-            vault read -format json "${CLIENT_CRED_VAULT_PATH}" | \
-            jq -r '.data."verily-auth0-dev-client-secret"')
-./tools/client-credentials.sh "src/main/resources/verily_auth0_dev_secret.json" "${clientId}" "${clientSecret}" \
-                              "rendered/verily_auth0_dev_secret.json"
-
-echo "Fetching Verily auth0 prod client id and client secrets"
-clientId=$(docker run --rm -e VAULT_TOKEN="${VAULT_TOKEN}" "${DSDE_TOOLBOX_DOCKER_IMAGE}" \
-            vault read -format json "${CLIENT_CRED_VAULT_PATH}" | \
-            jq -r '.data."verily-auth0-prod-client-id"')
-clientSecret=$(docker run --rm -e VAULT_TOKEN="${VAULT_TOKEN}" "${DSDE_TOOLBOX_DOCKER_IMAGE}" \
-            vault read -format json "${CLIENT_CRED_VAULT_PATH}" | \
-            jq -r '.data."verily-auth0-prod-client-secret"')
-./tools/client-credentials.sh "src/main/resources/verily_auth0_prod_secret.json" "${clientId}" "${clientSecret}" \
-                              "rendered/verily_auth0_prod_secret.json"