From 9dd22a59cfb0bc260cc3613bb7a63b306a87316c Mon Sep 17 00:00:00 2001 From: Ara Ghukasyan Date: Fri, 12 Jan 2024 14:58:38 -0500 Subject: [PATCH 01/18] read id's from user config; no required vars --- covalent_azurebatch_plugin/assets/infra/iam.tf | 15 +++++++-------- covalent_azurebatch_plugin/assets/infra/main.tf | 16 +++++++++++----- .../assets/infra/outputs.tf | 10 +++++++--- .../assets/infra/variables.tf | 3 +++ 4 files changed, 28 insertions(+), 16 deletions(-) diff --git a/covalent_azurebatch_plugin/assets/infra/iam.tf b/covalent_azurebatch_plugin/assets/infra/iam.tf index 46a6e11..965ce9e 100644 --- a/covalent_azurebatch_plugin/assets/infra/iam.tf +++ b/covalent_azurebatch_plugin/assets/infra/iam.tf @@ -25,13 +25,13 @@ resource "azurerm_user_assigned_identity" "batch" { } resource "azurerm_role_assignment" "batch_to_acr" { - scope = "/subscriptions/${var.subscription_id}" + scope = "/subscriptions/${local.subscription_id}" principal_id = azurerm_user_assigned_identity.batch.principal_id role_definition_name = "AcrPull" } resource "azurerm_role_assignment" "batch_to_storage" { - scope = "/subscriptions/${var.subscription_id}" + scope = "/subscriptions/${local.subscription_id}" principal_id = azurerm_user_assigned_identity.batch.principal_id role_definition_name = "Storage Blob Data Contributor" } @@ -43,16 +43,16 @@ resource "azurerm_role_assignment" "batch_to_storage" { resource "azuread_application" "batch" { description = "Covalent Azure Batch Plugin" display_name = "CovalentBatchPlugin" - owners = var.owners + owners = local.owners } resource "azuread_service_principal" "batch" { client_id = azuread_application.batch.client_id - owners = var.owners + owners = local.owners } resource "azurerm_role_assignment" "covalent_plugin_storage" { - scope = "/subscriptions/${var.subscription_id}" + scope = "/subscriptions/${local.subscription_id}" principal_id = azuread_service_principal.batch.id role_definition_name = "Storage Blob Data Contributor" } @@ -64,7 +64,7 @@ resource "azuread_service_principal_password" "covalent_plugin" { resource "azurerm_role_definition" "covalent_batch" { name = "${var.prefix}covalentbatch" - scope = "/subscriptions/${var.subscription_id}" + scope = "/subscriptions/${local.subscription_id}" description = "Covalent Azure Batch Permissions" permissions { actions = [ @@ -73,9 +73,8 @@ resource "azurerm_role_definition" "covalent_batch" { not_actions = [] } } - resource "azurerm_role_assignment" "covalent_plugin_batch" { - scope = "/subscriptions/${var.subscription_id}" + scope = "/subscriptions/${local.subscription_id}" principal_id = azuread_service_principal.batch.id role_definition_name = azurerm_role_definition.covalent_batch.name } diff --git a/covalent_azurebatch_plugin/assets/infra/main.tf b/covalent_azurebatch_plugin/assets/infra/main.tf index 2735c9c..cccbe2f 100644 --- a/covalent_azurebatch_plugin/assets/infra/main.tf +++ b/covalent_azurebatch_plugin/assets/infra/main.tf @@ -15,8 +15,6 @@ # limitations under the License. provider "azurerm" { - tenant_id = var.tenant_id - subscription_id = var.subscription_id features { resource_group { @@ -25,6 +23,14 @@ provider "azurerm" { } } +data "azurerm_client_config" "current" {} + +locals { + tenant_id = var.tenant_id != "" ? var.tenant_id : data.azurerm_client_config.current.tenant_id + subscription_id = var.subscription_id != "" ? var.subscription_id : data.azurerm_client_config.current.subscription_id + owners = length(var.owners) > 0 ? var.owners : [data.azurerm_client_config.current.object_id] +} + resource "azurerm_resource_group" "batch" { name = "${var.prefix}-covalent-batch" location = var.region @@ -89,9 +95,9 @@ data "template_file" "executor_config" { template = file("${path.module}/azurebatch.conf.tftpl") vars = { - subscription_id = var.subscription_id - tenant_id = var.tenant_id - client_id = "${azuread_application.batch.application_id}" + subscription_id = "${local.subscription_id}" + tenant_id = "${local.tenant_id}" + client_id = "${data.azurerm_client_config.current.client_id}" batch_account_url = "https://${azurerm_batch_account.covalent.account_endpoint}" batch_account_domain = "batch.core.windows.net" storage_account_name = "${azurerm_storage_account.batch.name}" diff --git a/covalent_azurebatch_plugin/assets/infra/outputs.tf b/covalent_azurebatch_plugin/assets/infra/outputs.tf index 6b02a77..cebbdbc 100644 --- a/covalent_azurebatch_plugin/assets/infra/outputs.tf +++ b/covalent_azurebatch_plugin/assets/infra/outputs.tf @@ -14,6 +14,10 @@ # See the License for the specific language governing permissions and # limitations under the License. +data "azuread_user" "current" { + object_id = data.azurerm_client_config.current.object_id +} + output "acr_login_server" { value = azurerm_container_registry.batch.login_server } @@ -23,7 +27,7 @@ output "user_identity_resource_id" { } output "plugin_client_username" { - value = azuread_application.batch.application_id + value = data.azuread_user.current.user_principal_name } output "plugin_client_secret" { @@ -34,8 +38,8 @@ output "plugin_client_secret" { output "covalent_azurebatch_object" { value = < Date: Fri, 12 Jan 2024 15:04:45 -0500 Subject: [PATCH 02/18] use templatefile func for macOS compatibility --- .../assets/infra/main.tf | 18 ++++++------------ 1 file changed, 6 insertions(+), 12 deletions(-) diff --git a/covalent_azurebatch_plugin/assets/infra/main.tf b/covalent_azurebatch_plugin/assets/infra/main.tf index cccbe2f..d53049f 100644 --- a/covalent_azurebatch_plugin/assets/infra/main.tf +++ b/covalent_azurebatch_plugin/assets/infra/main.tf @@ -26,9 +26,9 @@ provider "azurerm" { data "azurerm_client_config" "current" {} locals { - tenant_id = var.tenant_id != "" ? var.tenant_id : data.azurerm_client_config.current.tenant_id + tenant_id = var.tenant_id != "" ? var.tenant_id : data.azurerm_client_config.current.tenant_id subscription_id = var.subscription_id != "" ? var.subscription_id : data.azurerm_client_config.current.subscription_id - owners = length(var.owners) > 0 ? var.owners : [data.azurerm_client_config.current.object_id] + owners = length(var.owners) > 0 ? var.owners : [data.azurerm_client_config.current.object_id] } resource "azurerm_resource_group" "batch" { @@ -91,10 +91,9 @@ EOF } } -data "template_file" "executor_config" { - template = file("${path.module}/azurebatch.conf.tftpl") - - vars = { +resource "local_file" "executor_config" { + filename = "${path.module}/azurebatch.conf" + content = templatefile("${path.module}/azurebatch.conf.tftpl", { subscription_id = "${local.subscription_id}" tenant_id = "${local.tenant_id}" client_id = "${data.azurerm_client_config.current.client_id}" @@ -104,10 +103,5 @@ data "template_file" "executor_config" { storage_account_domain = "blob.core.windows.net" pool_id = "${azurerm_batch_pool.covalent.name}" retries = 3 - } -} - -resource "local_file" "executor_config" { - content = data.template_file.executor_config.rendered - filename = "${path.module}/azurebatch.conf" + }) } From 156499e8d513c5780e538611fa90002b9524ef8c Mon Sep 17 00:00:00 2001 From: Ara Ghukasyan Date: Fri, 12 Jan 2024 15:13:35 -0500 Subject: [PATCH 03/18] add missing gcc install --- covalent_azurebatch_plugin/assets/infra/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/covalent_azurebatch_plugin/assets/infra/Dockerfile b/covalent_azurebatch_plugin/assets/infra/Dockerfile index 792c787..d18c00e 100644 --- a/covalent_azurebatch_plugin/assets/infra/Dockerfile +++ b/covalent_azurebatch_plugin/assets/infra/Dockerfile @@ -19,7 +19,7 @@ FROM ${COVALENT_BASE_IMAGE} USER root -RUN apt-get update && apt-get install -y \ +RUN apt-get update && apt-get install -y gcc \ && rm -rf /var/lib/apt/lists/* \ && pip install --no-cache-dir --upgrade \ azure-batch==12.0.0 \ From 93aa524816ed83a65b35ae91849a00edd671c94f Mon Sep 17 00:00:00 2001 From: Ara Ghukasyan Date: Mon, 29 Jan 2024 16:29:26 -0500 Subject: [PATCH 04/18] fix typo --- covalent_azurebatch_plugin/assets/infra/variables.tf | 1 - 1 file changed, 1 deletion(-) diff --git a/covalent_azurebatch_plugin/assets/infra/variables.tf b/covalent_azurebatch_plugin/assets/infra/variables.tf index 1740395..c2b89f3 100644 --- a/covalent_azurebatch_plugin/assets/infra/variables.tf +++ b/covalent_azurebatch_plugin/assets/infra/variables.tf @@ -43,7 +43,6 @@ variable "owners" { default = [] description = "List of owner IDs for the service principal credentials" type = list(string) - default = [] } variable "vm_name" { From 2e4c24672049e4f57504b0da25700b7d0b19b004 Mon Sep 17 00:00:00 2001 From: Ara Ghukasyan Date: Mon, 29 Jan 2024 16:33:35 -0500 Subject: [PATCH 05/18] fix batch_account_url --- covalent_azurebatch_plugin/assets/infra/main.tf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/covalent_azurebatch_plugin/assets/infra/main.tf b/covalent_azurebatch_plugin/assets/infra/main.tf index fd01d17..f0fabbc 100644 --- a/covalent_azurebatch_plugin/assets/infra/main.tf +++ b/covalent_azurebatch_plugin/assets/infra/main.tf @@ -111,7 +111,7 @@ resource "local_file" "executor_config" { subscription_id = "${local.subscription_id}" tenant_id = "${local.tenant_id}" client_id = "${data.azurerm_client_config.current.client_id}" - batch_account_url = "https://${azurerm_batch_account.covalent.account_endpoint}" + batch_account_url = var.create_batch_account ? "https://${azurerm_batch_account.covalent[0].account_endpoint}" : "https://${data.azurerm_batch_account.covalent[0].account_endpoint}" batch_account_domain = "batch.core.windows.net" storage_account_name = "${azurerm_storage_account.batch.name}" storage_account_domain = "blob.core.windows.net" From 73253abaf23ded6bff069e4342df0dfc7d3169c6 Mon Sep 17 00:00:00 2001 From: Ara Ghukasyan Date: Mon, 29 Jan 2024 16:47:45 -0500 Subject: [PATCH 06/18] use null instead of empty list default --- covalent_azurebatch_plugin/assets/infra/variables.tf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/covalent_azurebatch_plugin/assets/infra/variables.tf b/covalent_azurebatch_plugin/assets/infra/variables.tf index c2b89f3..219c9bc 100644 --- a/covalent_azurebatch_plugin/assets/infra/variables.tf +++ b/covalent_azurebatch_plugin/assets/infra/variables.tf @@ -40,7 +40,7 @@ variable "subscription_id" { } variable "owners" { - default = [] + default = null description = "List of owner IDs for the service principal credentials" type = list(string) } From 49d6b920e66f150cbde098483c515327dc3f3340 Mon Sep 17 00:00:00 2001 From: Ara Ghukasyan Date: Mon, 29 Jan 2024 17:10:36 -0500 Subject: [PATCH 07/18] prune executor_config variables --- .../assets/infra/azurebatch.conf.tftpl | 3 +-- covalent_azurebatch_plugin/assets/infra/main.tf | 6 +++--- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/covalent_azurebatch_plugin/assets/infra/azurebatch.conf.tftpl b/covalent_azurebatch_plugin/assets/infra/azurebatch.conf.tftpl index e27b498..42d7c0e 100644 --- a/covalent_azurebatch_plugin/assets/infra/azurebatch.conf.tftpl +++ b/covalent_azurebatch_plugin/assets/infra/azurebatch.conf.tftpl @@ -1,7 +1,6 @@ [azurebatch] tenant_id = ${tenant_id} -client_id = ${client_id} -client_secret = ${client_secret} +subscription_id = ${subscription_id} batch_account_url = ${batch_account_url} batch_account_domain = ${batch_account_domain} storage_account_name = ${storage_account_name} diff --git a/covalent_azurebatch_plugin/assets/infra/main.tf b/covalent_azurebatch_plugin/assets/infra/main.tf index f0fabbc..5c98689 100644 --- a/covalent_azurebatch_plugin/assets/infra/main.tf +++ b/covalent_azurebatch_plugin/assets/infra/main.tf @@ -28,7 +28,7 @@ data "azurerm_client_config" "current" {} locals { tenant_id = coalesce(var.tenant_id, data.azurerm_client_config.current.tenant_id) subscription_id = coalesce(var.subscription_id, data.azurerm_client_config.current.subscription_id) - owners = length(var.owners) > 0 ? var.owners : [data.azurerm_client_config.current.object_id] + owners = coalesce(var.owners, [data.azurerm_client_config.current.object_id]) } resource "azurerm_resource_group" "batch" { @@ -108,14 +108,14 @@ EOF resource "local_file" "executor_config" { filename = "${path.module}/azurebatch.conf" content = templatefile("${path.module}/azurebatch.conf.tftpl", { - subscription_id = "${local.subscription_id}" tenant_id = "${local.tenant_id}" - client_id = "${data.azurerm_client_config.current.client_id}" + subscription_id = "${local.subscription_id}" batch_account_url = var.create_batch_account ? "https://${azurerm_batch_account.covalent[0].account_endpoint}" : "https://${data.azurerm_batch_account.covalent[0].account_endpoint}" batch_account_domain = "batch.core.windows.net" storage_account_name = "${azurerm_storage_account.batch.name}" storage_account_domain = "blob.core.windows.net" pool_id = "${azurerm_batch_pool.covalent.name}" retries = 3 + base_image_uri = "${azurerm_container_registry.batch.login_server}/covalent-executor-base" }) } From 143502a24a4eef3adb89b75bde2b9cc102d4d41d Mon Sep 17 00:00:00 2001 From: Ara Ghukasyan Date: Mon, 29 Jan 2024 17:14:03 -0500 Subject: [PATCH 08/18] recursive-include tf files in manifest --- MANIFEST.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/MANIFEST.in b/MANIFEST.in index b10bf3d..acc0132 100644 --- a/MANIFEST.in +++ b/MANIFEST.in @@ -1,3 +1,3 @@ include VERSION include requirements.txt -include covalent_azurebatch_plugin/assets/infra/* +recursive-include covalent_azurebatch_plugin/assets/infra/*.tf From c8639518b78243de0cdf7024e793b2c249e812d2 Mon Sep 17 00:00:00 2001 From: Ara Ghukasyan Date: Mon, 29 Jan 2024 17:42:22 -0500 Subject: [PATCH 09/18] absorb 'covalent' into prefix --- covalent_azurebatch_plugin/assets/infra/iam.tf | 4 ++-- covalent_azurebatch_plugin/assets/infra/main.tf | 4 ++-- covalent_azurebatch_plugin/assets/infra/storage.tf | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/covalent_azurebatch_plugin/assets/infra/iam.tf b/covalent_azurebatch_plugin/assets/infra/iam.tf index 4ae2049..12813be 100644 --- a/covalent_azurebatch_plugin/assets/infra/iam.tf +++ b/covalent_azurebatch_plugin/assets/infra/iam.tf @@ -19,7 +19,7 @@ ######################################### resource "azurerm_user_assigned_identity" "batch" { - name = "${var.prefix}covalentbatch" + name = "${var.prefix}batch" resource_group_name = var.create_batch_account ? azurerm_resource_group.batch[0].name : data.azurerm_resource_group.batch[0].name location = var.region } @@ -63,7 +63,7 @@ resource "azuread_service_principal_password" "covalent_plugin" { } resource "azurerm_role_definition" "covalent_batch" { - name = "${var.prefix}covalentbatch" + name = "${var.prefix}batch" scope = "/subscriptions/${local.subscription_id}" description = "Covalent Azure Batch Permissions" permissions { diff --git a/covalent_azurebatch_plugin/assets/infra/main.tf b/covalent_azurebatch_plugin/assets/infra/main.tf index 5c98689..a536043 100644 --- a/covalent_azurebatch_plugin/assets/infra/main.tf +++ b/covalent_azurebatch_plugin/assets/infra/main.tf @@ -32,7 +32,7 @@ locals { } resource "azurerm_resource_group" "batch" { - name = "${var.prefix}-covalent-batch" + name = "${var.prefix}-batch" count = var.create_batch_account ? 1 : 0 location = var.region } @@ -43,7 +43,7 @@ data "azurerm_resource_group" "batch" { } resource "azurerm_batch_account" "covalent" { - name = "${var.prefix}covalentbatch" + name = "${var.prefix}batch" count = var.create_batch_account ? 1 : 0 resource_group_name = azurerm_resource_group.batch[0].name location = azurerm_resource_group.batch[0].location diff --git a/covalent_azurebatch_plugin/assets/infra/storage.tf b/covalent_azurebatch_plugin/assets/infra/storage.tf index 0ec8ea7..3f20e3b 100644 --- a/covalent_azurebatch_plugin/assets/infra/storage.tf +++ b/covalent_azurebatch_plugin/assets/infra/storage.tf @@ -15,7 +15,7 @@ # limitations under the License. resource "azurerm_container_registry" "batch" { - name = "${var.prefix}covalentbatch" + name = "${var.prefix}batch" resource_group_name = var.create_batch_account ? azurerm_resource_group.batch[0].name : data.azurerm_resource_group.batch[0].name location = var.region @@ -33,7 +33,7 @@ resource "azurerm_container_registry" "batch" { } resource "azurerm_storage_account" "batch" { - name = "${var.prefix}covalentbatch" + name = "${var.prefix}batch" resource_group_name = var.create_batch_account ? azurerm_resource_group.batch[0].name : data.azurerm_resource_group.batch[0].name location = var.region From fb419d7eccb2d68e543ef8bcc2af36b967d46fbd Mon Sep 17 00:00:00 2001 From: Ara Ghukasyan Date: Mon, 29 Jan 2024 17:44:36 -0500 Subject: [PATCH 10/18] edit infra defaults to match --- covalent_azurebatch_plugin/azurebatch.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/covalent_azurebatch_plugin/azurebatch.py b/covalent_azurebatch_plugin/azurebatch.py index b6bc59a..6bc470c 100644 --- a/covalent_azurebatch_plugin/azurebatch.py +++ b/covalent_azurebatch_plugin/azurebatch.py @@ -65,9 +65,9 @@ class ExecutorInfraDefaults(BaseModel): Configuration values for provisioning Azure Batch cloud infrastructure """ - prefix: Optional[str] = "covalent-batch" + prefix: Optional[str] = "covalent" subscription_id: str - owners: List[str] = [] + owners: Optional[List[str]] = None tenant_id: str client_id: str = "" client_secret: str = "" @@ -91,7 +91,7 @@ class ExecutorInfraDefaults(BaseModel): EXECUTOR_PLUGIN_NAME = "AzureBatchExecutor" -_EXECUTOR_PLUGIN_DEFAULTS = ExecutorPluginDefaults().dict() +_EXECUTOR_PLUGIN_DEFAULTS = ExecutorPluginDefaults().model_dump() FUNC_FILENAME = "func-{dispatch_id}-{node_id}.pkl" RESULT_FILENAME = "result-{dispatch_id}-{node_id}.pkl" From ec493876d6861c36127afb05dee133ad3e11451b Mon Sep 17 00:00:00 2001 From: Ara Ghukasyan Date: Mon, 29 Jan 2024 18:19:37 -0500 Subject: [PATCH 11/18] include Dockerfile in manifest --- MANIFEST.in | 1 + 1 file changed, 1 insertion(+) diff --git a/MANIFEST.in b/MANIFEST.in index acc0132..6e50ff5 100644 --- a/MANIFEST.in +++ b/MANIFEST.in @@ -1,3 +1,4 @@ include VERSION include requirements.txt +include covalent_azurebatch_plugin/assets/infra/Dockerfile recursive-include covalent_azurebatch_plugin/assets/infra/*.tf From 76182c4f1dcd89374552a23fafd82b981ec11e19 Mon Sep 17 00:00:00 2001 From: Ara Ghukasyan Date: Mon, 29 Jan 2024 18:19:51 -0500 Subject: [PATCH 12/18] specify platform for docker build --- covalent_azurebatch_plugin/assets/infra/storage.tf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/covalent_azurebatch_plugin/assets/infra/storage.tf b/covalent_azurebatch_plugin/assets/infra/storage.tf index 3f20e3b..abebf91 100644 --- a/covalent_azurebatch_plugin/assets/infra/storage.tf +++ b/covalent_azurebatch_plugin/assets/infra/storage.tf @@ -25,7 +25,7 @@ resource "azurerm_container_registry" "batch" { interpreter = ["/bin/bash", "-c"] command = < Date: Mon, 29 Jan 2024 19:41:18 -0500 Subject: [PATCH 13/18] update changelog --- CHANGELOG.md | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index c4ca8f0..2463661 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,6 +9,14 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## [0.17.0] - 2024-01-17 +## Changed + +- Read id's from user's config instead of input (no more required args) +- Update executor config output, remove unused +- Make `owners` var optional +- Conform to 'alphanumeric chars only' rule for resource names +- Use `templatefile` instead of `template_file` (MacOS compatibility) + ### Added - Added `covalent_package_version` so that we can specify the version of the covalent to use when building the docker image From 5545bd3a0e1d92b5db7c721b25e885c9a11ea807 Mon Sep 17 00:00:00 2001 From: Ara Ghukasyan Date: Mon, 29 Jan 2024 19:54:37 -0500 Subject: [PATCH 14/18] fix changelog oops --- CHANGELOG.md | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 2463661..8388137 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,9 +7,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## [UNRELEASED] -## [0.17.0] - 2024-01-17 -## Changed +### Changed - Read id's from user's config instead of input (no more required args) - Update executor config output, remove unused @@ -17,6 +16,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - Conform to 'alphanumeric chars only' rule for resource names - Use `templatefile` instead of `template_file` (MacOS compatibility) +## [0.17.0] - 2024-01-17 + ### Added - Added `covalent_package_version` so that we can specify the version of the covalent to use when building the docker image From 2f9ab1e1f6ddebf62a1a9748b044c9989cdaf1c5 Mon Sep 17 00:00:00 2001 From: Ara Ghukasyan Date: Mon, 29 Jan 2024 20:13:43 -0500 Subject: [PATCH 15/18] include exec.py and conf file --- MANIFEST.in | 2 ++ 1 file changed, 2 insertions(+) diff --git a/MANIFEST.in b/MANIFEST.in index 6e50ff5..8ffa8df 100644 --- a/MANIFEST.in +++ b/MANIFEST.in @@ -1,4 +1,6 @@ include VERSION include requirements.txt include covalent_azurebatch_plugin/assets/infra/Dockerfile +include covalent_azurebatch_plugin/assets/infra/azurebatch.conf.tftpl +include covalent_azurebatch_plugin/assets/infra/exec.py recursive-include covalent_azurebatch_plugin/assets/infra/*.tf From f8241eed6f7e1ff5c49fb5895eb0c6926cb52b77 Mon Sep 17 00:00:00 2001 From: Ara Ghukasyan Date: Mon, 29 Jan 2024 20:17:59 -0500 Subject: [PATCH 16/18] non-recursive include tf files --- MANIFEST.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/MANIFEST.in b/MANIFEST.in index 8ffa8df..670ab59 100644 --- a/MANIFEST.in +++ b/MANIFEST.in @@ -3,4 +3,4 @@ include requirements.txt include covalent_azurebatch_plugin/assets/infra/Dockerfile include covalent_azurebatch_plugin/assets/infra/azurebatch.conf.tftpl include covalent_azurebatch_plugin/assets/infra/exec.py -recursive-include covalent_azurebatch_plugin/assets/infra/*.tf +include covalent_azurebatch_plugin/assets/infra/*.tf From 5ae1b6d3ce074de43001febf89cd3dc61800f58c Mon Sep 17 00:00:00 2001 From: Ara Ghukasyan Date: Mon, 29 Jan 2024 20:21:10 -0500 Subject: [PATCH 17/18] recursive-include assets --- MANIFEST.in | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/MANIFEST.in b/MANIFEST.in index 670ab59..61dfc93 100644 --- a/MANIFEST.in +++ b/MANIFEST.in @@ -1,6 +1,3 @@ include VERSION include requirements.txt -include covalent_azurebatch_plugin/assets/infra/Dockerfile -include covalent_azurebatch_plugin/assets/infra/azurebatch.conf.tftpl -include covalent_azurebatch_plugin/assets/infra/exec.py -include covalent_azurebatch_plugin/assets/infra/*.tf +recursive-include covalent_azurebatch_plugin/assets/infra From dde77b8007ee50005c6f4500792983466f0b9f82 Mon Sep 17 00:00:00 2001 From: Ara Ghukasyan Date: Mon, 29 Jan 2024 20:23:00 -0500 Subject: [PATCH 18/18] reverting manifest changes smh --- MANIFEST.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/MANIFEST.in b/MANIFEST.in index 61dfc93..b10bf3d 100644 --- a/MANIFEST.in +++ b/MANIFEST.in @@ -1,3 +1,3 @@ include VERSION include requirements.txt -recursive-include covalent_azurebatch_plugin/assets/infra +include covalent_azurebatch_plugin/assets/infra/*