AN-186 Add pool configs with Google Batch enabled

src/main/resources/config/buffertest/pool_schema.yml

@@ -4,3 +4,6 @@ poolConfigs:
   - poolId: "resource_buffer_test_v2"
     size: 1500
     resourceConfigName: "resource_buffer_test_v2"
+  - poolId: "resource_buffer_test_v3"
+    size: 1500
+    resourceConfigName: "resource_buffer_test_v3"

src/main/resources/config/buffertest/resource-config/resource_buffer_test_v3.yml

@@ -0,0 +1,35 @@
+# Resource template for running buffer service performance test
+---
+configName: "resource_buffer_test_v3"
+gcpProjectConfig:
+  projectIdSchema:
+    prefix: "buffer-test"
+    scheme: "RANDOM_CHAR"
+  # test.firecloud.org/tools/buffertest
+  parentFolderId: "339691735869"
+  billingAccount: "01A82E-CA8A14-367457"
+  enabledApis:
+    - "bigquery-json.googleapis.com"
+    - "batch.googleapis.com"
+    - "compute.googleapis.com"
+    - "container.googleapis.com"
+    - "cloudbilling.googleapis.com"
+    - "clouderrorreporting.googleapis.com"
+    - "cloudkms.googleapis.com"
+    - "cloudtrace.googleapis.com"
+    - "containerregistry.googleapis.com"
+    - "dataflow.googleapis.com"
+    - "dataproc.googleapis.com"
+    - "dns.googleapis.com"
+    - "lifesciences.googleapis.com"
+    - "logging.googleapis.com"
+    - "monitoring.googleapis.com"
+    - "storage-api.googleapis.com"
+    - "storage-component.googleapis.com"
+  iamBindings:
+    - members: [ "group:terra-rbs-test@broadinstitute.org" ]
+      role: "roles/editor"
+    - members: [ "group:terra-rbs-viewer-test@broadinstitute.org" ]
+      role: "roles/viewer"
+  network:
+    enableNetworkMonitoring: "true"

src/main/resources/config/dev/pool_schema.yml

@@ -4,6 +4,9 @@ poolConfigs:
   - poolId: "cwb_ws_dev_v7"
     size: 300
     resourceConfigName: "cwb_ws_resource_dev_v7"
+  - poolId: "cwb_ws_dev_v8"
+    size: 300
+    resourceConfigName: "cwb_ws_resource_dev_v8"
   - poolId: "datarepo_fakeprod_v1"
     size: 50
     resourceConfigName: "datarepo_fakeprod_v1"
@@ -13,6 +16,12 @@ poolConfigs:
   - poolId: "vpc_sc_v12"
     size: 300
     resourceConfigName: "vpc_sc_v12"
+  - poolId: "vpc_sc_v13"
+    size: 300
+    resourceConfigName: "vpc_sc_v13"
   - poolId: "workspace_manager_v11"
     size: 500
     resourceConfigName: "workspace_manager_v11"
+  - poolId: "workspace_manager_v12"
+    size: 500
+    resourceConfigName: "workspace_manager_v12"

src/main/resources/config/dev/resource-config/cwb_ws_resource_dev_v8.yml

@@ -0,0 +1,33 @@
+# Community Workbench buffered workspace template
+---
+configName: "cwb_ws_resource_dev_v8"
+gcpProjectConfig:
+  projectIdSchema:
+    prefix: "terra-dev"
+    scheme: "RANDOM_CHAR"
+  # test.firecloud.org/dev/CommunityWorkbench
+  parentFolderId: "803412578462"
+  billingAccount: "01A82E-CA8A14-367457"
+  enabledApis:
+    - "bigquery-json.googleapis.com"
+    - "batch.googleapis.com"
+    - "compute.googleapis.com"
+    - "container.googleapis.com"
+    - "cloudbilling.googleapis.com"
+    - "clouderrorreporting.googleapis.com"
+    - "cloudkms.googleapis.com"
+    - "cloudtrace.googleapis.com"
+    - "containerregistry.googleapis.com"
+    - "dataflow.googleapis.com"
+    - "dataproc.googleapis.com"
+    - "dns.googleapis.com"
+    - "lifesciences.googleapis.com"
+    - "logging.googleapis.com"
+    - "monitoring.googleapis.com"
+    - "storage-api.googleapis.com"
+    - "storage-component.googleapis.com"
+  network:
+    enableNetworkMonitoring: "false"
+    enablePrivateGoogleAccess: "true"
+  kubernetesEngine:
+    createGkeDefaultServiceAccount: "true"

src/main/resources/config/dev/resource-config/vpc_sc_v13.yml

@@ -0,0 +1,42 @@
+# # Projects with VPC-SC configuration
+---
+configName: "vpc_sc_v13"
+gcpProjectConfig:
+  projectIdSchema:
+    prefix: "terra-vpc-sc-dev"
+    scheme: "RANDOM_CHAR"
+  # test.firecloud.org/dev/for_vpc_sc_unclaimed
+  parentFolderId: "1061905712535"
+  billingAccount: "01A82E-CA8A14-367457"
+  enabledApis:
+    - "bigquery-json.googleapis.com"
+    - "batch.googleapis.com"
+    - "compute.googleapis.com"
+    - "container.googleapis.com"
+    - "cloudbilling.googleapis.com"
+    - "clouderrorreporting.googleapis.com"
+    - "cloudkms.googleapis.com"
+    - "cloudtrace.googleapis.com"
+    - "containerregistry.googleapis.com"
+    - "dataflow.googleapis.com"
+    - "dataproc.googleapis.com"
+    - "dns.googleapis.com"
+    - "lifesciences.googleapis.com"
+    - "logging.googleapis.com"
+    - "monitoring.googleapis.com"
+    - "serviceusage.googleapis.com"
+    - "storage-api.googleapis.com"
+    - "storage-component.googleapis.com"
+  network:
+    enableNetworkMonitoring: "true"
+    enablePrivateGoogleAccess: "true"
+    enableCloudRegistryPrivateGoogleAccess: "true"
+    enableArtifactRegistryPrivateGoogleAccess: "true"
+    blockBatchInternetAccess: "true"
+  kubernetesEngine:
+    createGkeDefaultServiceAccount: "true"
+  serviceUsage:
+    bigQuery:
+      overrideBigQueryDailyUsageQuota: true
+      bigQueryDailyUsageQuotaOverrideValueMebibytes: 38146972 # 40 TB
+  securityGroup: "high"

src/main/resources/config/dev/resource-config/workspace_manager_v12.yml

@@ -0,0 +1,31 @@
+# Workspace Manager buffered workspace template
+---
+configName: "workspace_manager_v12"
+gcpProjectConfig:
+  projectIdSchema:
+    prefix: "terra-wsm-d"
+    scheme: "TWO_WORDS_NUMBER"
+  parentFolderId: "421312654454" #test.firecloud.org/dev/buffer-dev/workspace_manager
+  billingAccount: "01A82E-CA8A14-367457"
+  enabledApis:
+  - "bigquery-json.googleapis.com"
+  - "bigquerydatatransfer.googleapis.com"
+  - "batch.googleapis.com"
+  - "compute.googleapis.com"
+  - "container.googleapis.com"
+  - "cloudbilling.googleapis.com"
+  - "clouderrorreporting.googleapis.com"
+  - "cloudkms.googleapis.com"
+  - "cloudtrace.googleapis.com"
+  - "containerregistry.googleapis.com"
+  - "dataflow.googleapis.com"
+  - "dataproc.googleapis.com"
+  - "dns.googleapis.com"
+  - "lifesciences.googleapis.com"
+  - "logging.googleapis.com"
+  - "monitoring.googleapis.com"
+  - "notebooks.googleapis.com"
+  - "storage-api.googleapis.com"
+  - "storage-component.googleapis.com"
+  network:
+    enableNetworkMonitoring: "true"

src/main/resources/config/prod/pool_schema.yml

@@ -4,6 +4,9 @@ poolConfigs:
   - poolId: "cwb_ws_prod_v7"
     size: 3000
     resourceConfigName: "cwb_ws_prod_v7"
+  - poolId: "cwb_ws_prod_v8"
+    size: 3000
+    resourceConfigName: "cwb_ws_prod_v8"
   - poolId: "datarepo_v1"
     size: 1000
     resourceConfigName: "datarepo_v1"
@@ -13,3 +16,6 @@ poolConfigs:
   - poolId: "vpc_sc_v11"
     size: 1000
     resourceConfigName: "vpc_sc_v11"
+  - poolId: "vpc_sc_v12"
+    size: 1000
+    resourceConfigName: "vpc_sc_v12"

src/main/resources/config/prod/resource-config/cwb_ws_prod_v8.yml

@@ -0,0 +1,33 @@
+# Community Workbench buffered workspace template
+---
+configName: "cwb_ws_prod_v8"
+gcpProjectConfig:
+  projectIdSchema:
+    prefix: "terra"
+    scheme: "RANDOM_CHAR"
+  # firecloud.org/prod/CommunityWorkbench
+  parentFolderId: "710468670182"
+  billingAccount: "0106B0-41CAA9-427C96"
+  enabledApis:
+    - "bigquery-json.googleapis.com"
+    - "batch.googleapis.com"
+    - "compute.googleapis.com"
+    - "container.googleapis.com"
+    - "containerregistry.googleapis.com"
+    - "cloudbilling.googleapis.com"
+    - "clouderrorreporting.googleapis.com"
+    - "cloudkms.googleapis.com"
+    - "cloudtrace.googleapis.com"
+    - "dataflow.googleapis.com"
+    - "dataproc.googleapis.com"
+    - "dns.googleapis.com"
+    - "lifesciences.googleapis.com"
+    - "logging.googleapis.com"
+    - "monitoring.googleapis.com"
+    - "storage-api.googleapis.com"
+    - "storage-component.googleapis.com"
+  network:
+    enableNetworkMonitoring: "false"
+    enablePrivateGoogleAccess: "true"
+  kubernetesEngine:
+    createGkeDefaultServiceAccount: "true"

src/main/resources/config/prod/resource-config/vpc_sc_v12.yml

@@ -0,0 +1,42 @@
+# Projects with VPC-SC configuration
+---
+configName: "vpc_sc_v12"
+gcpProjectConfig:
+  projectIdSchema:
+    prefix: "terra-vpc-sc"
+    scheme: "RANDOM_CHAR"
+  # firecloud.org/prod/for_vpc_sc_unclaimed
+  parentFolderId: "160283235721"
+  billingAccount: "0106B0-41CAA9-427C96"
+  enabledApis:
+    - "bigquery-json.googleapis.com"
+    - "batch.googleapis.com"
+    - "compute.googleapis.com"
+    - "container.googleapis.com"
+    - "cloudbilling.googleapis.com"
+    - "clouderrorreporting.googleapis.com"
+    - "cloudkms.googleapis.com"
+    - "cloudtrace.googleapis.com"
+    - "containerregistry.googleapis.com"
+    - "dataflow.googleapis.com"
+    - "dataproc.googleapis.com"
+    - "dns.googleapis.com"
+    - "lifesciences.googleapis.com"
+    - "logging.googleapis.com"
+    - "monitoring.googleapis.com"
+    - "serviceusage.googleapis.com"
+    - "storage-api.googleapis.com"
+    - "storage-component.googleapis.com"
+  network:
+    enableNetworkMonitoring: "true"
+    enablePrivateGoogleAccess: "true"
+    enableCloudRegistryPrivateGoogleAccess: "true"
+    enableArtifactRegistryPrivateGoogleAccess: "true"
+    blockBatchInternetAccess: "true"
+  kubernetesEngine:
+    createGkeDefaultServiceAccount: "true"
+  serviceUsage:
+    bigQuery:
+      overrideBigQueryDailyUsageQuota: true
+      bigQueryDailyUsageQuotaOverrideValueMebibytes: 38146972 # 40 TB
+  securityGroup: "high"

src/main/resources/config/staging/pool_schema.yml

@@ -4,9 +4,15 @@ poolConfigs:
   - poolId: "cwb_ws_staging_v7"
     size: 100
     resourceConfigName: "cwb_ws_resource_staging_v7"
+  - poolId: "cwb_ws_staging_v8"
+    size: 100
+    resourceConfigName: "cwb_ws_resource_staging_v8"
   - poolId: "datarepo_v1"
     size: 300
     resourceConfigName: "datarepo_v1"
   - poolId: "vpc_sc_v6"
     size: 100
     resourceConfigName: "vpc_sc_v6"
+  - poolId: "vpc_sc_v7"
+    size: 100
+    resourceConfigName: "vpc_sc_v7"

src/main/resources/config/staging/resource-config/cwb_ws_resource_staging_v8.yml

@@ -0,0 +1,33 @@
+# Community Workbench buffered workspace template
+---
+configName: "cwb_ws_resource_staging_v8"
+gcpProjectConfig:
+  projectIdSchema:
+    prefix: "terra-staging"
+    scheme: "RANDOM_CHAR"
+  # test.firecloud.org/staging/CommunityWorkbench
+  parentFolderId: "137690849844"
+  billingAccount: "01A82E-CA8A14-367457"
+  enabledApis:
+  - "bigquery-json.googleapis.com"
+  - "batch.googleapis.com"
+  - "compute.googleapis.com"
+  - "container.googleapis.com"
+  - "containerregistry.googleapis.com"
+  - "cloudbilling.googleapis.com"
+  - "clouderrorreporting.googleapis.com"
+  - "cloudkms.googleapis.com"
+  - "cloudtrace.googleapis.com"
+  - "dataflow.googleapis.com"
+  - "dataproc.googleapis.com"
+  - "dns.googleapis.com"
+  - "lifesciences.googleapis.com"
+  - "logging.googleapis.com"
+  - "monitoring.googleapis.com"
+  - "storage-api.googleapis.com"
+  - "storage-component.googleapis.com"
+  network:
+    enableNetworkMonitoring: "false"
+    enablePrivateGoogleAccess: "true"
+  kubernetesEngine:
+    createGkeDefaultServiceAccount: "true"

src/main/resources/config/staging/resource-config/vpc_sc_v7.yml

@@ -0,0 +1,35 @@
+# Community Workbench buffered workspace template
+---
+configName: "vpc_sc_v7"
+gcpProjectConfig:
+  projectIdSchema:
+    prefix: "terra-vpc-sc-staging"
+    scheme: "RANDOM_CHAR"
+  # test.firecloud.org/staging/for_vpc_sc_unclaimed
+  parentFolderId: "119547684332"
+  billingAccount: "01A82E-CA8A14-367457"
+  enabledApis:
+  - "bigquery-json.googleapis.com"
+  - "batch.googleapis.com"
+  - "compute.googleapis.com"
+  - "container.googleapis.com"
+  - "containerregistry.googleapis.com"
+  - "cloudbilling.googleapis.com"
+  - "clouderrorreporting.googleapis.com"
+  - "cloudkms.googleapis.com"
+  - "cloudtrace.googleapis.com"
+  - "dataflow.googleapis.com"
+  - "dataproc.googleapis.com"
+  - "dns.googleapis.com"
+  - "lifesciences.googleapis.com"
+  - "logging.googleapis.com"
+  - "monitoring.googleapis.com"
+  - "storage-api.googleapis.com"
+  - "storage-component.googleapis.com"
+  network:
+    enableNetworkMonitoring: "true"
+    enablePrivateGoogleAccess: "true"
+    enableCloudRegistryPrivateGoogleAccess: "true"
+    blockBatchInternetAccess: "true"
+  kubernetesEngine:
+    createGkeDefaultServiceAccount: "true"

src/main/resources/config/tools/pool_schema.yml

@@ -5,18 +5,30 @@ poolConfigs:
   - poolId: "cwb_ws_fiab_v7"
     size: 500
     resourceConfigName: "cwb_ws_resource_fiab_v7"
+  - poolId: "cwb_ws_fiab_v8"
+    size: 500
+    resourceConfigName: "cwb_ws_resource_fiab_v8"
   - poolId: "cwb_ws_quality_v8"
     size: 5000
     resourceConfigName: "cwb_ws_resource_quality_v8"
   - poolId: "cwb_ws_quality_v10"
     size: 5000
     resourceConfigName: "cwb_ws_resource_quality_v10"
+  - poolId: "cwb_ws_quality_v11"
+    size: 5000
+    resourceConfigName: "cwb_ws_resource_quality_v11"
   - poolId: "datarepo_v1"
     size: 2000
     resourceConfigName: "datarepo_v1"
   - poolId: "vpc_sc_qa-fiab_v5"
     size: 100
     resourceConfigName: "vpc_sc_qa-fiab_v5"
+  - poolId: "vpc_sc_qa-fiab_v6"
+    size: 100
+    resourceConfigName: "vpc_sc_qa-fiab_v6"
   - poolId: "workspace_manager_v11"
     size: 500
     resourceConfigName: "workspace_manager_v11"
+  - poolId: "workspace_manager_v12"
+    size: 500
+    resourceConfigName: "workspace_manager_v12"