Resolved merge conflict in ConvertTo-AzOpsState.ps1

Azure · Jan 15, 2024 · 94e0f53 · 94e0f53
2 parents 43ee01d + 3a77d8c
commit 94e0f53
Show file tree

Hide file tree

Showing 24 changed files with 24 additions and 24 deletions.
diff --git a/src/tests/functional/Microsoft.Authorization/policyAssignments/scenario.ps1 b/src/tests/functional/Microsoft.Authorization/policyAssignments/scenario.ps1
@@ -67,7 +67,7 @@ Describe "Scenario - policyAssignments" {
             $script:fileContents.resources[0].name | Should -BeTrue
         }
         It "Resource apiVersion should exist" {
-            $script:fileContents.resources[0].apiVersion | Should -BeTrue
+            $script:fileContents.resources[0].apiVersion | Should -Match '^\d{4}\-(0[1-9]|1[012])\-(0[1-9]|[12][0-9]|3[01])$'
         }
         It "Resource properties should exist" {
             $script:fileContents.resources[0].properties | Should -BeTrue

diff --git a/src/tests/functional/Microsoft.Authorization/roleAssignments/scenario.ps1 b/src/tests/functional/Microsoft.Authorization/roleAssignments/scenario.ps1
@@ -67,7 +67,7 @@ Describe "Scenario - roleAssignments" {
             $script:fileContents.resources[0].name | Should -BeTrue
         }
         It "Resource apiVersion should exist" {
-            $script:fileContents.resources[0].apiVersion | Should -BeTrue
+            $script:fileContents.resources[0].apiVersion | Should -Match '^\d{4}\-(0[1-9]|1[012])\-(0[1-9]|[12][0-9]|3[01])$'
         }
         It "Resource properties should exist" {
             $script:fileContents.resources[0].properties | Should -BeTrue

diff --git a/src/tests/functional/Microsoft.Authorization/roleEligibilityScheduleRequests/scenario.ps1 b/src/tests/functional/Microsoft.Authorization/roleEligibilityScheduleRequests/scenario.ps1
@@ -57,7 +57,7 @@ Describe "Scenario - roleEligibilityScheduleRequests" {
             $script:fileContents.resources[0].name | Should -BeTrue
         }
         It "Resource apiVersion should exist" {
-            $script:fileContents.resources[0].apiVersion | Should -BeTrue
+            $script:fileContents.resources[0].apiVersion | Should -Match '^\d{4}\-(0[1-9]|1[012])\-(0[1-9]|[12][0-9]|3[01])$'
         }
         It "Resource properties should exist" {
             $script:fileContents.resources[0].properties | Should -BeTrue

diff --git a/src/tests/functional/Microsoft.Compute/virtualMachines/scenario.ps1 b/src/tests/functional/Microsoft.Compute/virtualMachines/scenario.ps1
@@ -55,7 +55,7 @@ Describe "Scenario - virtualMachines" {
             $script:fileContents.resources[0].location | Should -BeTrue
         }
         It "Resource apiVersion should exist" {
-            $script:fileContents.resources[0].apiVersion | Should -BeTrue
+            $script:fileContents.resources[0].apiVersion | Should -Match '^\d{4}\-(0[1-9]|1[012])\-(0[1-9]|[12][0-9]|3[01])$'
         }
         It "Resource zones should exist" {
             $script:fileContents.resources[0].zones | Should -BeTrue

diff --git a/src/tests/functional/Microsoft.Insights/activityLogAlerts/scenario.ps1 b/src/tests/functional/Microsoft.Insights/activityLogAlerts/scenario.ps1
@@ -52,7 +52,7 @@ Describe "Scenario - activityLogAlerts" {
             $script:fileContents.resources[0].name | Should -BeTrue
         }
         It "Resource apiVersion should exist" {
-            $script:fileContents.resources[0].apiVersion | Should -BeTrue
+            $script:fileContents.resources[0].apiVersion | Should -Match '^\d{4}\-(0[1-9]|1[012])\-(0[1-9]|[12][0-9]|3[01])$'
         }
         It "Resource action group Id should exist" {
             $script:fileContents.resources[0].properties.actions.actionGroups.actionGroupId | Should -BeTrue

diff --git a/src/tests/functional/Microsoft.KeyVault/vaults/scenario.ps1 b/src/tests/functional/Microsoft.KeyVault/vaults/scenario.ps1
@@ -52,7 +52,7 @@ Describe "Scenario - vaults" {
             $script:fileContents.resources[0].name | Should -BeTrue
         }
         It "Resource apiVersion should exist" {
-            $script:fileContents.resources[0].apiVersion | Should -BeTrue
+            $script:fileContents.resources[0].apiVersion | Should -Match '^\d{4}\-(0[1-9]|1[012])\-(0[1-9]|[12][0-9]|3[01])$'
         }
         It "Resource properties should exist" {
             $script:fileContents.resources[0].properties | Should -BeTrue

diff --git a/src/tests/functional/Microsoft.Logic/workflows/scenario.ps1 b/src/tests/functional/Microsoft.Logic/workflows/scenario.ps1
@@ -52,7 +52,7 @@ Describe "Scenario - workflows" {
             $script:fileContents.resources[0].name | Should -BeTrue
         }
         It "Resource apiVersion should exist" {
-            $script:fileContents.resources[0].apiVersion | Should -BeTrue
+            $script:fileContents.resources[0].apiVersion | Should -Match '^\d{4}\-(0[1-9]|1[012])\-(0[1-9]|[12][0-9]|3[01])$'
         }
         It "Resource type should match" {
             $script:fileContents.resources[0].type | Should -Be "$script:resourceProvider/$script:resourceType"

diff --git a/src/tests/functional/Microsoft.ManagedIdentity/userAssignedIdentities/scenario.ps1 b/src/tests/functional/Microsoft.ManagedIdentity/userAssignedIdentities/scenario.ps1
@@ -52,7 +52,7 @@ Describe "Scenario - userAssignedIdentities" {
             $script:fileContents.resources[0].name | Should -BeTrue
         }
         It "Resource apiVersion should exist" {
-            $script:fileContents.resources[0].apiVersion | Should -BeTrue
+            $script:fileContents.resources[0].apiVersion | Should -Match '^\d{4}\-(0[1-9]|1[012])\-(0[1-9]|[12][0-9]|3[01])$'
         }
         It "Resource location should exist" {
             $script:fileContents.resources[0].location | Should -BeTrue

diff --git a/src/tests/functional/Microsoft.Management/managementGroups/scenario.ps1 b/src/tests/functional/Microsoft.Management/managementGroups/scenario.ps1
@@ -52,7 +52,7 @@ Describe "Scenario - managementGroups" {
             $script:fileContents.resources[0].name | Should -BeTrue
         }
         It "Resource apiVersion should exist" {
-            $script:fileContents.resources[0].apiVersion | Should -BeTrue
+            $script:fileContents.resources[0].apiVersion | Should -Match '^\d{4}\-(0[1-9]|1[012])\-(0[1-9]|[12][0-9]|3[01])$'
         }
         It "Resource properties should exist" {
             $script:fileContents.resources[0].properties | Should -BeTrue

diff --git a/src/tests/functional/Microsoft.Network/azureFirewalls/scenario.ps1 b/src/tests/functional/Microsoft.Network/azureFirewalls/scenario.ps1
@@ -52,7 +52,7 @@ Describe "Scenario - azureFirewalls" {
             $script:fileContents.resources[0].name | Should -BeTrue
         }
         It "Resource apiVersion should exist" {
-            $script:fileContents.resources[0].apiVersion | Should -BeTrue
+            $script:fileContents.resources[0].apiVersion | Should -Match '^\d{4}\-(0[1-9]|1[012])\-(0[1-9]|[12][0-9]|3[01])$'
         }
         It "Resource zones should exist" {
             $script:fileContents.resources[0].zones | Should -BeTrue

diff --git a/src/tests/functional/Microsoft.Network/bastionHosts/scenario.ps1 b/src/tests/functional/Microsoft.Network/bastionHosts/scenario.ps1
@@ -52,7 +52,7 @@ Describe "Scenario - bastionHosts" {
             $script:fileContents.resources[0].name | Should -BeTrue
         }
         It "Resource apiVersion should exist" {
-            $script:fileContents.resources[0].apiVersion | Should -BeTrue
+            $script:fileContents.resources[0].apiVersion | Should -Match '^\d{4}\-(0[1-9]|1[012])\-(0[1-9]|[12][0-9]|3[01])$'
         }
         It "Resource properties should exist" {
             $script:fileContents.resources[0].properties | Should -BeTrue

diff --git a/src/tests/functional/Microsoft.Network/connections/scenario.ps1 b/src/tests/functional/Microsoft.Network/connections/scenario.ps1
@@ -52,7 +52,7 @@ Describe "Scenario - connections" {
             $script:fileContents.resources[0].name | Should -BeTrue
         }
         It "Resource apiVersion should exist" {
-            $script:fileContents.resources[0].apiVersion | Should -BeTrue
+            $script:fileContents.resources[0].apiVersion | Should -Match '^\d{4}\-(0[1-9]|1[012])\-(0[1-9]|[12][0-9]|3[01])$'
         }
         It "Resource properties should exist" {
             $script:fileContents.resources[0].properties | Should -BeTrue

diff --git a/src/tests/functional/Microsoft.Network/localNetworkGateways/scenario.ps1 b/src/tests/functional/Microsoft.Network/localNetworkGateways/scenario.ps1
@@ -52,7 +52,7 @@ Describe "Scenario - localNetworkGateways" {
             $script:fileContents.resources[0].name | Should -BeTrue
         }
         It "Resource apiVersion should exist" {
-            $script:fileContents.resources[0].apiVersion | Should -BeTrue
+            $script:fileContents.resources[0].apiVersion | Should -Match '^\d{4}\-(0[1-9]|1[012])\-(0[1-9]|[12][0-9]|3[01])$'
         }
         It "Resource properties should exist" {
             $script:fileContents.resources[0].properties | Should -BeTrue

diff --git a/src/tests/functional/Microsoft.Network/networkInterfaces/scenario.ps1 b/src/tests/functional/Microsoft.Network/networkInterfaces/scenario.ps1
@@ -52,7 +52,7 @@ Describe "Scenario - networkInterfaces" {
             $script:fileContents.resources[0].name | Should -BeTrue
         }
         It "Resource apiVersion should exist" {
-            $script:fileContents.resources[0].apiVersion | Should -BeTrue
+            $script:fileContents.resources[0].apiVersion | Should -Match '^\d{4}\-(0[1-9]|1[012])\-(0[1-9]|[12][0-9]|3[01])$'
         }
         It "Resource properties should exist" {
             $script:fileContents.resources[0].properties | Should -BeTrue

diff --git a/src/tests/functional/Microsoft.Network/networkSecurityGroups/scenario.ps1 b/src/tests/functional/Microsoft.Network/networkSecurityGroups/scenario.ps1
@@ -52,7 +52,7 @@ Describe "Scenario - networkSecurityGroups" {
             $script:fileContents.resources[0].name | Should -BeTrue
         }
         It "Resource apiVersion should exist" {
-            $script:fileContents.resources[0].apiVersion | Should -BeTrue
+            $script:fileContents.resources[0].apiVersion | Should -Match '^\d{4}\-(0[1-9]|1[012])\-(0[1-9]|[12][0-9]|3[01])$'
         }
         It "Resource properties should exist" {
             $script:fileContents.resources[0].properties | Should -BeTrue

diff --git a/src/tests/functional/Microsoft.Network/privateDnsZones/scenario.ps1 b/src/tests/functional/Microsoft.Network/privateDnsZones/scenario.ps1
@@ -52,7 +52,7 @@ Describe "Scenario - privateDnsZones" {
             $script:fileContents.resources[0].name | Should -BeTrue
         }
         It "Resource apiVersion should exist" {
-            $script:fileContents.resources[0].apiVersion | Should -BeTrue
+            $script:fileContents.resources[0].apiVersion | Should -Match '^\d{4}\-(0[1-9]|1[012])\-(0[1-9]|[12][0-9]|3[01])$'
         }
         It "Resource type should match" {
             $script:fileContents.resources[0].type | Should -Be "$script:resourceProvider/$script:resourceType"

diff --git a/src/tests/functional/Microsoft.Network/privateEndpoints/scenario.ps1 b/src/tests/functional/Microsoft.Network/privateEndpoints/scenario.ps1
@@ -52,7 +52,7 @@ Describe "Scenario - privateEndpoints" {
             $script:fileContents.resources[0].name | Should -BeTrue
         }
         It "Resource apiVersion should exist" {
-            $script:fileContents.resources[0].apiVersion | Should -BeTrue
+            $script:fileContents.resources[0].apiVersion | Should -Match '^\d{4}\-(0[1-9]|1[012])\-(0[1-9]|[12][0-9]|3[01])$'
         }
         It "Resource type should match" {
             $script:fileContents.resources[0].type | Should -Be "$script:resourceProvider/$script:resourceType"

diff --git a/src/tests/functional/Microsoft.Network/publicIPAddresses/scenario.ps1 b/src/tests/functional/Microsoft.Network/publicIPAddresses/scenario.ps1
@@ -52,7 +52,7 @@ Describe "Scenario - publicIPAddresses" {
             $script:fileContents.resources[0].name | Should -BeTrue
         }
         It "Resource apiVersion should exist" {
-            $script:fileContents.resources[0].apiVersion | Should -BeTrue
+            $script:fileContents.resources[0].apiVersion | Should -Match '^\d{4}\-(0[1-9]|1[012])\-(0[1-9]|[12][0-9]|3[01])$'
         }
         It "Resource properties should exist" {
             $script:fileContents.resources[0].properties | Should -BeTrue

diff --git a/src/tests/functional/Microsoft.Network/routeTables/scenario.ps1 b/src/tests/functional/Microsoft.Network/routeTables/scenario.ps1
@@ -52,7 +52,7 @@ Describe "Scenario - routeTables" {
             $script:fileContents.resources[0].name | Should -BeTrue
         }
         It "Resource apiVersion should exist" {
-            $script:fileContents.resources[0].apiVersion | Should -BeTrue
+            $script:fileContents.resources[0].apiVersion | Should -Match '^\d{4}\-(0[1-9]|1[012])\-(0[1-9]|[12][0-9]|3[01])$'
         }
         It "Resource properties should exist" {
             $script:fileContents.resources[0].properties | Should -BeTrue

diff --git a/src/tests/functional/Microsoft.Network/virtualNetworks/scenario.ps1 b/src/tests/functional/Microsoft.Network/virtualNetworks/scenario.ps1
@@ -52,7 +52,7 @@ Describe "Scenario - virtualNetworks" {
             $script:fileContents.resources[0].name | Should -BeTrue
         }
         It "Resource apiVersion should exist" {
-            $script:fileContents.resources[0].apiVersion | Should -BeTrue
+            $script:fileContents.resources[0].apiVersion | Should -Match '^\d{4}\-(0[1-9]|1[012])\-(0[1-9]|[12][0-9]|3[01])$'
         }
         It "Resource properties should exist" {
             $script:fileContents.resources[0].properties | Should -BeTrue

diff --git a/src/tests/functional/Microsoft.Resources/resourceGroups/scenario.ps1 b/src/tests/functional/Microsoft.Resources/resourceGroups/scenario.ps1
@@ -52,7 +52,7 @@ Describe "Scenario - resourceGroups" {
             $script:fileContents.resources[0].name | Should -BeTrue
         }
         It "Resource apiVersion should exist" {
-            $script:fileContents.resources[0].apiVersion | Should -BeTrue
+            $script:fileContents.resources[0].apiVersion | Should -Match '^\d{4}\-(0[1-9]|1[012])\-(0[1-9]|[12][0-9]|3[01])$'
         }
         It "Resource properties should exist" {
             $script:fileContents.resources[0].properties | Should -BeTrue

diff --git a/src/tests/functional/Microsoft.Storage/storageAccounts/scenario.ps1 b/src/tests/functional/Microsoft.Storage/storageAccounts/scenario.ps1
@@ -52,7 +52,7 @@ Describe "Scenario - storageAccounts" {
             $script:fileContents.resources[0].name | Should -BeTrue
         }
         It "Resource apiVersion should exist" {
-            $script:fileContents.resources[0].apiVersion | Should -BeTrue
+            $script:fileContents.resources[0].apiVersion | Should -Match '^\d{4}\-(0[1-9]|1[012])\-(0[1-9]|[12][0-9]|3[01])$'
         }
         It "Resource properties should exist" {
             $script:fileContents.resources[0].properties | Should -BeTrue

diff --git a/src/tests/functional/Microsoft.Web/serverfarms/scenario.ps1 b/src/tests/functional/Microsoft.Web/serverfarms/scenario.ps1
@@ -52,7 +52,7 @@ Describe "Scenario - serverfarms" {
             $script:fileContents.resources[0].name | Should -BeTrue
         }
         It "Resource apiVersion should exist" {
-            $script:fileContents.resources[0].apiVersion | Should -BeTrue
+            $script:fileContents.resources[0].apiVersion | Should -Match '^\d{4}\-(0[1-9]|1[012])\-(0[1-9]|[12][0-9]|3[01])$'
         }
         It "Resource properties should exist" {
             $script:fileContents.resources[0].properties | Should -BeTrue

diff --git a/src/tests/functional/Microsoft.Web/sites/scenario.ps1 b/src/tests/functional/Microsoft.Web/sites/scenario.ps1
@@ -52,7 +52,7 @@ Describe "Scenario - sites" {
             $script:fileContents.resources[0].name | Should -BeTrue
         }
         It "Resource apiVersion should exist" {
-            $script:fileContents.resources[0].apiVersion | Should -BeTrue
+            $script:fileContents.resources[0].apiVersion | Should -Match '^\d{4}\-(0[1-9]|1[012])\-(0[1-9]|[12][0-9]|3[01])$'
         }
         It "Resource properties should exist" {
             $script:fileContents.resources[0].properties | Should -BeTrue