skip: update CI 195

epam · Aug 14, 2024 · cec17a2 · cec17a2
1 parent 3d87384
commit cec17a2
Show file tree

Hide file tree

Showing 8 changed files with 11 additions and 7 deletions.
diff --git a/.github/workflows/auto-test.yml b/.github/workflows/auto-test.yml
@@ -12,7 +12,7 @@ on:
       resource_priority_list:
         type: string
         description: Priority list for resources (you can remove unnecessary resources during testing)
-        default: '["front-door", "data", "defender", "container", "cognitiveservice", "batch"]'
+        default: '["data", "cognitiveservice", "batch"]'
         #'["storage", "webapp", "vnet", "network", "vm", "synapse", "sql", "mysql", "subscription", "disk", "postgresql", "cosmosdb", "signalr", "spring", "search", "service-fabric", "stream", "redis", "servicebus", "role", "monitor", "machine-learning", "logic", "kusto", "aks", "keyvault", "iothub", "front-door", "event", "data", "defender", "container", "cognitiveservice", "batch"]'
         required: true
 
@@ -26,7 +26,7 @@ env:
   AZURE_TENANT_ID: ${{ secrets.AZURE_TENANT_ID }}
   AZURE_SUBSCRIPTION_ID: ${{ secrets.AZURE_SUBSCRIPTION_ID }}
   AZURE_SECRET_VALUE: ${{ secrets.AZURE_SECRET_VALUE }}
-  default_resource_priority_list: '["front-door", "data", "defender", "container", "cognitiveservice", "batch"]'
+  default_resource_priority_list: '["data", "cognitiveservice", "batch"]'
   #default_resource_priority_list: '["storage", "webapp", "vnet", "network", "vm", "synapse", "sql", "mysql", "subscription", "disk", "postgresql", "cosmosdb", "signalr", "spring", "search", "service-fabric", "stream", "redis", "servicebus", "role", "monitor", "machine-learning", "logic", "kusto", "aks", "keyvault", "iothub", "front-door", "event", "data", "defender", "container", "cognitiveservice", "batch"]'
   TF_VAR_project: ${{ secrets.TF_VAR_project }}
   TF_VAR_region: ${{ secrets.AWS_REGION }}

diff --git a/auto_policy_testing/green/batch/outputs.tf b/auto_policy_testing/green/batch/outputs.tf
@@ -1,5 +1,5 @@
 output "batch" {
   value = {
-    batch = azurerm_batch_account.this.id
+    batch = "/subscriptions/${data.azurerm_client_config.current.subscription_id}/resourceGroups/green-infrastructure-ci/providers/Microsoft.Batch/batchAccounts/${azurerm_batch_account.this.id}"
   }
 }
diff --git a/auto_policy_testing/green/cognitiveservice/cognitiveservices.tf b/auto_policy_testing/green/cognitiveservice/cognitiveservices.tf
@@ -2,7 +2,7 @@ resource "azurerm_cognitive_account" "this" {
   name                          = module.naming.resource_prefix.cognitive
   location                      = data.terraform_remote_state.common.outputs.location
   resource_group_name           = data.terraform_remote_state.common.outputs.resource_group
-  kind                          = "OpenAI"
+  kind                          = "Emotion"
 
   public_network_access_enabled = "false"
 

diff --git a/auto_policy_testing/green/data/data_factory.tf b/auto_policy_testing/green/data/data_factory.tf
@@ -20,5 +20,7 @@ resource "azurerm_data_factory" "this" {
   customer_managed_key_id          = data.terraform_remote_state.common.outputs.key_id
 
   tags = module.naming.default_tags
+
+  depends_on = [ azurerm_key_vault_access_policy.user_identity ]
 }
 
diff --git a/auto_policy_testing/green/data/outputs.tf b/auto_policy_testing/green/data/outputs.tf
@@ -1,6 +1,6 @@
 output "data" {
   value = {
-    databricks  = "/subscriptions/${data.azurerm_client_config.current.subscription_id}/resourceGroups/green-infrastructure-ci/providers/Microsoft.Databricks/workspaces/${azurerm_databricks_workspace.this.name}",
+    databricks  = "/subscriptions/${data.azurerm_client_config.current.subscription_id}/resourceGroups/${data.terraform_remote_state.common.outputs.resource_group}/providers/Microsoft.Databricks/workspaces/${azurerm_databricks_workspace.this.name}",
     datafactory = "/subscriptions/${data.azurerm_client_config.current.subscription_id}/resourceGroups/green-infrastructure-ci/providers/Microsoft.DataFactory/factories/${azurerm_data_factory.this.name}"
   }
 }
diff --git a/auto_policy_testing/red/batch/batch_account.tf b/auto_policy_testing/red/batch/batch_account.tf
@@ -1,3 +1,5 @@
+data "azurerm_client_config" "current" {}
+
 resource "azurerm_batch_account" "this" {
   name                          = module.naming.resource_prefix.batch
   location                      = "eastus"

diff --git a/auto_policy_testing/red/batch/outputs.tf b/auto_policy_testing/red/batch/outputs.tf
@@ -1,5 +1,5 @@
 output "batch" {
   value = {
-    batch = azurerm_batch_account.this.id
+    batch = "/subscriptions/${data.azurerm_client_config.current.subscription_id}/resourceGroups/red-infrastructure-ci/providers/Microsoft.Batch/batchAccounts/${azurerm_batch_account.this.id}"
   }
 }
diff --git a/auto_policy_testing/red/data/outputs.tf b/auto_policy_testing/red/data/outputs.tf
@@ -1,6 +1,6 @@
 output "data" {
   value = {
-    databricks  = "/subscriptions/${data.azurerm_client_config.current.subscription_id}/resourceGroups/red-infrastructure-ci/providers/Microsoft.Databricks/workspaces/${azurerm_databricks_workspace.this.name}",
+    databricks  = "/subscriptions/${data.azurerm_client_config.current.subscription_id}/resourceGroups/${data.terraform_remote_state.common.outputs.resource_group}/providers/Microsoft.Databricks/workspaces/${azurerm_databricks_workspace.this.name}",
     datafactory = "/subscriptions/${data.azurerm_client_config.current.subscription_id}/resourceGroups/red-infrastructure-ci/providers/Microsoft.DataFactory/factories/${azurerm_data_factory.this.name}"
   }
 }