From 07413706af78134fbcede0bcd716bca55bd813dc Mon Sep 17 00:00:00 2001
From: Ben Broderick Phillips <bebroder@microsoft.com>
Date: Thu, 19 Oct 2023 14:44:11 -0400
Subject: [PATCH 1/2] Bump min tls version to 1.2 for digital twins live test
 storage account

---
 sdk/digitaltwins/test-resources.bicep | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/sdk/digitaltwins/test-resources.bicep b/sdk/digitaltwins/test-resources.bicep
index 024b813e2042..b158969e5adf 100644
--- a/sdk/digitaltwins/test-resources.bicep
+++ b/sdk/digitaltwins/test-resources.bicep
@@ -69,7 +69,7 @@ resource eventHubNamespaceAuthRules 'Microsoft.EventHub/namespaces/Authorization
         ]
     }
 }
- 
+
 resource eventHubNamespaceEventHubAuthRules 'Microsoft.EventHub/namespaces/eventhubs/authorizationRules@2017-04-01' = {
     name: '${eventHubNamespaceEventHub.name}/owner'
     properties: {
@@ -103,6 +103,9 @@ resource storageAccount 'Microsoft.Storage/storageAccounts@2022-05-01' = {
         name: 'Standard_LRS'
     }
     kind: 'StorageV2'
+    properties: {
+        minimumTlsVersion: 'TLS1_2'
+    }
 
     resource blobService 'blobServices' = {
         name: 'default'
@@ -164,4 +167,4 @@ resource deploymentScript 'Microsoft.Resources/deploymentScripts@2020-10-01' = {
     }
 }
 
-output INPUT_BLOB_URI string = 'https://${storageAccount.name}.blob.${environment().suffixes.storage}/${containerName}/${blobName}'
\ No newline at end of file
+output INPUT_BLOB_URI string = 'https://${storageAccount.name}.blob.${environment().suffixes.storage}/${containerName}/${blobName}'

From ab143257e4b8412a224e73eb66f6b74e52f327d5 Mon Sep 17 00:00:00 2001
From: Ben Broderick Phillips <bebroder@microsoft.com>
Date: Thu, 19 Oct 2023 17:06:12 -0400
Subject: [PATCH 2/2] Bump min tls version to 1.2 for digital twins live test
 event hub

---
 sdk/digitaltwins/test-resources.bicep | 3 ++-
 sdk/digitaltwins/tests.yml            | 7 +------
 2 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/sdk/digitaltwins/test-resources.bicep b/sdk/digitaltwins/test-resources.bicep
index b158969e5adf..e5e816ed9860 100644
--- a/sdk/digitaltwins/test-resources.bicep
+++ b/sdk/digitaltwins/test-resources.bicep
@@ -34,7 +34,7 @@ resource digitaltwinRoleAssignment 'Microsoft.Authorization/roleAssignments@2020
     scope: digitaltwin
 }
 
-resource eventHubNamespace 'Microsoft.EventHub/namespaces@2018-01-01-preview' = {
+resource eventHubNamespace 'Microsoft.EventHub/namespaces@2022-01-01-preview' = {
     name: baseName
     location: location
     sku: {
@@ -47,6 +47,7 @@ resource eventHubNamespace 'Microsoft.EventHub/namespaces@2018-01-01-preview' =
         isAutoInflateEnabled: false
         maximumThroughputUnits: 0
         kafkaEnabled: false
+        minimumTlsVersion: 'TLS1_2'
     }
 }
 
diff --git a/sdk/digitaltwins/tests.yml b/sdk/digitaltwins/tests.yml
index b4d7c7541a4d..ef2a0b428260 100644
--- a/sdk/digitaltwins/tests.yml
+++ b/sdk/digitaltwins/tests.yml
@@ -4,13 +4,8 @@ extends:
   template: ../../eng/pipelines/templates/stages/archetype-sdk-tests.yml
   parameters:
     ServiceDirectory: digitaltwins
-    # Enable canary and public cloud testing in separate subscriptions, so that the tests-weekly builds
-    # don't exceed the 10 azure digital twin instance hard limit
     CloudConfig:
       Public:
         SubscriptionConfiguration: $(sub-config-azure-cloud-test-resources)
         Location: westcentralus
-      Canary:
-        SubscriptionConfiguration: $(sub-config-azure-cloud-test-resources-preview)
-        Location: eastus2euap
-    Clouds: Public,Canary
+    Clouds: Public