skip: update CI 301

epam · Oct 1, 2024 · 142b4ad · 142b4ad
1 parent a7666ad
commit 142b4ad
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 10 deletions.
diff --git a/.github/workflows/auto-test.yml b/.github/workflows/auto-test.yml
@@ -11,7 +11,7 @@ on:
       resource_priority_list:
         type: string
         description: Priority list for resources (you can remove unnecessary resources during testing)
-        default: '["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", "automation", "application", "app-configuration", "api", "alert"]'
+        default: '["storage", "machine-learning", "data"]'
         #'["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", "automation", "application", "app-configuration", "api", "alert"]'
         required: true
 
@@ -25,7 +25,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: '["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", "automation", "application", "app-configuration", "api", "alert"]'
+  default_resource_priority_list: '["storage", "machine-learning", "data"]'
   #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", "automation", "application", "app-configuration", "api", "alert"]'
   TF_VAR_project: ${{ secrets.TF_VAR_project }}
   TF_VAR_region: ${{ secrets.AWS_REGION }}

diff --git a/auto_policy_testing/green/api/api-management.tf b/auto_policy_testing/green/api/api-management.tf
@@ -14,6 +14,11 @@ resource "azurerm_api_management" "this" {
   }
 
   tags = module.naming.default_tags
+
+  timeouts {
+    create = "2h"
+    delete = "2h"
+  }
 }
 
 resource "azurerm_api_management" "this1" {
@@ -34,6 +39,11 @@ resource "azurerm_api_management" "this1" {
 
   tags = module.naming.default_tags
 
+  timeouts {
+    create = "2h"
+    delete = "2h"
+  }
+
   depends_on = [ azurerm_subnet_network_security_group_association.this ]
 }
 

diff --git a/auto_policy_testing/red/api/api-management.tf b/auto_policy_testing/red/api/api-management.tf
@@ -6,4 +6,9 @@ resource "azurerm_api_management" "this" {
   publisher_email      = "[email protected]"
 
   sku_name = "Consumption_0"
+
+  timeouts {
+    create = "2h"
+    delete = "2h"
+  }
 }
diff --git a/auto_policy_testing/red/storage/storage_account.tf b/auto_policy_testing/red/storage/storage_account.tf
@@ -1,14 +1,7 @@
-resource "azurerm_resource_group" "this" {
-  name     = "${module.naming.resource_prefix.resourcegroup}"
-  location = "eastus"
-
-  tags = module.naming.default_tags
-}
-
 resource "azurerm_storage_account" "this" {
   name                      = "${module.naming.resource_prefix.storage}storage${random_integer.this.result}"
   location                  = "eastus" #this option required for 291 policy
-  resource_group_name       = azurerm_resource_group.this.name
+  resource_group_name       = data.terraform_remote_state.common.outputs.resource_group
   account_tier              = "Standard"
   account_replication_type  = "LRS"
   enable_https_traffic_only = false