Fixup merge

dotnet · May 23, 2023 · cc81e59 · cc81e59
1 parent 253f708
commit cc81e59
Show file tree

Hide file tree

Showing 6 changed files with 31 additions and 11 deletions.
diff --git a/documentation/schema.json b/documentation/schema.json
@@ -1159,6 +1159,13 @@
           ],
           "description": "Client id of the Managed Identity used for authentication. The identity must have permissions to create containers and write to blob storage."
         },
+        "UseWorkloadIdentityFromEnvironment": {
+          "type": [
+            "boolean",
+            "null"
+          ],
+          "description": "Uses WorkloadIdentity for authentication. The environment variables AZURE_CLIENT_ID, AZURE_TENANT_ID, AZURE_FEDERATED_TOKEN_FILE, and AZURE_AUTHORITY_HOST are used to authenticate."
+        },
         "ContainerName": {
           "type": "string",
           "description": "The name of the container to which the blob will be egressed. If egressing to the root container, use the \"$root\" sentinel value.",

diff --git a/src/Microsoft.Diagnostics.Monitoring.Options/OptionsDisplayStrings.Designer.cs b/src/Microsoft.Diagnostics.Monitoring.Options/OptionsDisplayStrings.Designer.cs
diff --git a/src/Microsoft.Diagnostics.Monitoring.Options/OptionsDisplayStrings.resx b/src/Microsoft.Diagnostics.Monitoring.Options/OptionsDisplayStrings.resx
@@ -530,12 +530,13 @@
     <comment>The description provided for the DumpTempFolder parameter on StorageOptions.</comment>
   </data>
   <data name="ErrorMessage_CredentialsMissing" xml:space="preserve">
-    <value>The {0} field, {1} field, or {2} field is required.</value>
-    <comment>Gets the format string for rejecting validation due to 3 missing fields where at least one is required.
-3 Format Parameters:
+    <value>The {0} field, {1} field, {2} field, or {3} field is required.</value>
+    <comment>Gets the format string for rejecting validation due to 4 missing fields where at least one is required.
+4 Format Parameters:
 0. fieldNameOne: The name of the first field that is missing
 1. fieldNameTwo: The name of the second field that is missing
-2. fieldNameThree: The name of the third field that is missing</comment>
+2. fieldNameThree: The name of the third field that is missing
+3. fieldNameFour: The name of the fourth field that is missing</comment>
   </data>
   <data name="DisplayAttributeDescription_CollectLogsOptions_Format" xml:space="preserve">
     <value>The format of the logs artifact.</value>
@@ -804,4 +805,7 @@
   <data name="DisplayAttributeDescription_MetricsOptions_Meters" xml:space="preserve">
     <value>Names of meters to collect from the System.Diagnostics.Metrics provider.</value>
   </data>
+  <data name="DisplayAttributeDescription_AzureBlobEgressProviderOptions_UseWorkloadIdentityFromEnvironment" xml:space="preserve">
+    <value>Uses WorkloadIdentity for authentication. The environment variables AZURE_CLIENT_ID, AZURE_TENANT_ID, AZURE_FEDERATED_TOKEN_FILE, and AZURE_AUTHORITY_HOST are used to authenticate.</value>
+  </data>
 </root>
diff --git a/...ft.Diagnostics.Monitoring.Tool.UnitTests/Egress/AzureBlob/AzureBlobEgressProviderTests.cs b/...ft.Diagnostics.Monitoring.Tool.UnitTests/Egress/AzureBlob/AzureBlobEgressProviderTests.cs
@@ -252,7 +252,7 @@ public async Task AzureBlobEgress_DoesNotThrowWhen_QueueDoesNotExistAndUsingRest
             Assert.Empty(messages);
         }
 
-        [ConditionalFact(Timeout = EgressUnitTestTimeoutMs)]
+        [ConditionalFact(Timeout = TestTimeouts.EgressUnitTestTimeoutMs)]
         public void AzureBlobEgress_DefaultCredentials()
         {
             // These are auth methods we know about. If this test fails, it means a new auth method was added and we need to update the test.

diff --git a/src/Tools/dotnet-monitor/Strings.Designer.cs b/src/Tools/dotnet-monitor/Strings.Designer.cs
diff --git a/src/Tools/dotnet-monitor/Strings.resx b/src/Tools/dotnet-monitor/Strings.resx
@@ -164,9 +164,8 @@
     <comment>Gets a string similar to "File system egress failed.".</comment>
   </data>
   <data name="ErrorMessage_EgressMissingCredentials" xml:space="preserve">
-    <value>SharedAccessSignature, AccountKey, or ManagedIdentityClientId must be specified.</value>
-    <comment>Gets a string similar to "SharedAccessSignature, AccountKey, or ManagedIdentityClientId must be specified.".</comment>
-  </data>
+      <value>SharedAccessSignature, AccountKey, ManagedIdentityClientId, or UseWorkloadIdentityFromEnvironment must be specified.</value>
+      <comment>Gets a string similar to "SharedAccessSignature, AccountKey, ManagedIdentityClientId, or UseWorkflowIdentity must be specified.".</comment>  </data>
   <data name="ErrorMessage_EgressProviderDoesNotExist" xml:space="preserve">
     <value>Egress provider '{0}' does not exist.</value>
     <comment>Gets the format string for egress provider failure due to missing provider.
@@ -811,4 +810,4 @@
     <value>:REDACTED:</value>
     <comment>Gets a string similar to ":REDACTED:".</comment>
   </data>
-</root>
+</root>