Tsp - Merge headers from different content types (#1420)

dolauli · web-flow · commit bcb7e884edb2 · 2024-12-25T09:36:32.000+08:00
diff --git a/packages/typespec-powershell/src/convertor/convertor.ts b/packages/typespec-powershell/src/convertor/convertor.ts
@@ -260,18 +260,28 @@ function addResponses(psContext: SdkContext, op: HttpOperation, newOperation: Op
         (<any>newResponse).schema = schema;
       }
       // Add headers
+      // we merge headers here, if the same header is defined in multiple responses, we only add it once.
+      // This is aligned with the behavior of typescript emitter and typespec-autorest emitter.
       newResponse.protocol.http = newResponse.protocol.http ?? new Protocol();
-      if (response.responses[0].headers) {
-        for (const key in response.responses[0].headers) {
-          newResponse.protocol.http.headers = newResponse.protocol.http.headers || [];
-          const header = response.responses[0].headers[key];
-          const headerSchema = getSchemaForType(psContext, header.type);
-          const headerResponse = new HttpHeader(key, headerSchema);
-          headerResponse.language = new Languages();
-          headerResponse.language.default = new Language();
-          headerResponse.language.default.description = getDoc(psContext.program, header) || "";
-          headerResponse.language.default.name = pascalCase(deconstruct(key));
-          newResponse.protocol.http.headers.push(headerResponse);
+      const addedKeys: string[] = [];
+      for (const innerResponse of response.responses) {
+        if (innerResponse.headers) {
+          for (const key in innerResponse.headers) {
+            if (addedKeys.includes(key)) {
+              continue;
+            } else {
+              addedKeys.push(key);
+            }
+            newResponse.protocol.http.headers = newResponse.protocol.http.headers || [];
+            const header = innerResponse.headers[key];
+            const headerSchema = getSchemaForType(psContext, header.type);
+            const headerResponse = new HttpHeader(key, headerSchema);
+            headerResponse.language = new Languages();
+            headerResponse.language.default = new Language();
+            headerResponse.language.default.description = getDoc(psContext.program, header) || "";
+            headerResponse.language.default.name = pascalCase(deconstruct(key));
+            newResponse.protocol.http.headers.push(headerResponse);
+          }
         }
       }
       newResponse.protocol.http.statusCodes = statusCode === "*" ? ["default"] : [statusCode];
diff --git a/tests-upgrade/tests-emitter/AppComplianceAutomation.Management/target/generated/api/Models/ProviderActionsOnboardAcceptedResponseHeaders.PowerShell.cs b/tests-upgrade/tests-emitter/AppComplianceAutomation.Management/target/generated/api/Models/ProviderActionsOnboardAcceptedResponseHeaders.PowerShell.cs
@@ -115,6 +115,10 @@ internal ProviderActionsOnboardAcceptedResponseHeaders(global::System.Collection
             {
                 ((Microsoft.Azure.PowerShell.Cmdlets.AppComplianceAutomation.Models.IProviderActionsOnboardAcceptedResponseHeadersInternal)this).Location = (string) content.GetValueForProperty("Location",((Microsoft.Azure.PowerShell.Cmdlets.AppComplianceAutomation.Models.IProviderActionsOnboardAcceptedResponseHeadersInternal)this).Location, global::System.Convert.ToString);
             }
+            if (content.Contains("RetryAfter"))
+            {
+                ((Microsoft.Azure.PowerShell.Cmdlets.AppComplianceAutomation.Models.IProviderActionsOnboardAcceptedResponseHeadersInternal)this).RetryAfter = (int?) content.GetValueForProperty("RetryAfter",((Microsoft.Azure.PowerShell.Cmdlets.AppComplianceAutomation.Models.IProviderActionsOnboardAcceptedResponseHeadersInternal)this).RetryAfter, (__y)=> (int) global::System.Convert.ChangeType(__y, typeof(int)));
+            }
             AfterDeserializeDictionary(content);
         }
 
@@ -136,6 +140,10 @@ internal ProviderActionsOnboardAcceptedResponseHeaders(global::System.Management
             {
                 ((Microsoft.Azure.PowerShell.Cmdlets.AppComplianceAutomation.Models.IProviderActionsOnboardAcceptedResponseHeadersInternal)this).Location = (string) content.GetValueForProperty("Location",((Microsoft.Azure.PowerShell.Cmdlets.AppComplianceAutomation.Models.IProviderActionsOnboardAcceptedResponseHeadersInternal)this).Location, global::System.Convert.ToString);
             }
+            if (content.Contains("RetryAfter"))
+            {
+                ((Microsoft.Azure.PowerShell.Cmdlets.AppComplianceAutomation.Models.IProviderActionsOnboardAcceptedResponseHeadersInternal)this).RetryAfter = (int?) content.GetValueForProperty("RetryAfter",((Microsoft.Azure.PowerShell.Cmdlets.AppComplianceAutomation.Models.IProviderActionsOnboardAcceptedResponseHeadersInternal)this).RetryAfter, (__y)=> (int) global::System.Convert.ChangeType(__y, typeof(int)));
+            }
             AfterDeserializePSObject(content);
         }
 
diff --git a/tests-upgrade/tests-emitter/AppComplianceAutomation.Management/target/generated/api/Models/ProviderActionsOnboardAcceptedResponseHeaders.cs b/tests-upgrade/tests-emitter/AppComplianceAutomation.Management/target/generated/api/Models/ProviderActionsOnboardAcceptedResponseHeaders.cs
@@ -17,13 +17,23 @@ public partial class ProviderActionsOnboardAcceptedResponseHeaders :
         [Microsoft.Azure.PowerShell.Cmdlets.AppComplianceAutomation.Origin(Microsoft.Azure.PowerShell.Cmdlets.AppComplianceAutomation.PropertyOrigin.Owned)]
         public string Location { get => this._location; set => this._location = value; }
 
+        /// <summary>Backing field for <see cref="RetryAfter" /> property.</summary>
+        private int? _retryAfter;
+
+        [Microsoft.Azure.PowerShell.Cmdlets.AppComplianceAutomation.Origin(Microsoft.Azure.PowerShell.Cmdlets.AppComplianceAutomation.PropertyOrigin.Owned)]
+        public int? RetryAfter { get => this._retryAfter; set => this._retryAfter = value; }
+
         /// <param name="headers"></param>
         void Microsoft.Azure.PowerShell.Cmdlets.AppComplianceAutomation.Runtime.IHeaderSerializable.ReadHeaders(global::System.Net.Http.Headers.HttpResponseHeaders headers)
         {
             if (headers.TryGetValues("Location", out var __locationHeader0))
             {
                 ((Microsoft.Azure.PowerShell.Cmdlets.AppComplianceAutomation.Models.IProviderActionsOnboardAcceptedResponseHeadersInternal)this).Location = System.Linq.Enumerable.FirstOrDefault(__locationHeader0) is string __headerLocationHeader0 ? __headerLocationHeader0 : (string)null;
             }
+            if (headers.TryGetValues("Retry-After", out var __retryAfterHeader1))
+            {
+                ((Microsoft.Azure.PowerShell.Cmdlets.AppComplianceAutomation.Models.IProviderActionsOnboardAcceptedResponseHeadersInternal)this).RetryAfter = System.Linq.Enumerable.FirstOrDefault(__retryAfterHeader1) is string __headerRetryAfterHeader1 ? int.TryParse( __headerRetryAfterHeader1, out int __headerRetryAfterHeader1Value ) ? __headerRetryAfterHeader1Value : default(int?) : default(int?);
+            }
         }
 
         /// <summary>
@@ -48,11 +58,24 @@ public partial interface IProviderActionsOnboardAcceptedResponseHeaders
         PossibleTypes = new [] { typeof(string) })]
         string Location { get; set; }
 
+        [Microsoft.Azure.PowerShell.Cmdlets.AppComplianceAutomation.Runtime.Info(
+        Required = false,
+        ReadOnly = false,
+        Read = true,
+        Create = true,
+        Update = true,
+        Description = @"",
+        SerializedName = @"Retry-After",
+        PossibleTypes = new [] { typeof(int) })]
+        int? RetryAfter { get; set; }
+
     }
     internal partial interface IProviderActionsOnboardAcceptedResponseHeadersInternal
 
     {
         string Location { get; set; }
 
+        int? RetryAfter { get; set; }
+
     }
 }
diff --git a/tests-upgrade/tests-emitter/AppComplianceAutomation.Management/target/generated/api/Models/ProviderActionsTriggerEvaluationAcceptedResponseHeaders.PowerShell.cs b/tests-upgrade/tests-emitter/AppComplianceAutomation.Management/target/generated/api/Models/ProviderActionsTriggerEvaluationAcceptedResponseHeaders.PowerShell.cs
@@ -115,6 +115,10 @@ internal ProviderActionsTriggerEvaluationAcceptedResponseHeaders(global::System.
             {
                 ((Microsoft.Azure.PowerShell.Cmdlets.AppComplianceAutomation.Models.IProviderActionsTriggerEvaluationAcceptedResponseHeadersInternal)this).Location = (string) content.GetValueForProperty("Location",((Microsoft.Azure.PowerShell.Cmdlets.AppComplianceAutomation.Models.IProviderActionsTriggerEvaluationAcceptedResponseHeadersInternal)this).Location, global::System.Convert.ToString);
             }
+            if (content.Contains("RetryAfter"))
+            {
+                ((Microsoft.Azure.PowerShell.Cmdlets.AppComplianceAutomation.Models.IProviderActionsTriggerEvaluationAcceptedResponseHeadersInternal)this).RetryAfter = (int?) content.GetValueForProperty("RetryAfter",((Microsoft.Azure.PowerShell.Cmdlets.AppComplianceAutomation.Models.IProviderActionsTriggerEvaluationAcceptedResponseHeadersInternal)this).RetryAfter, (__y)=> (int) global::System.Convert.ChangeType(__y, typeof(int)));
+            }
             AfterDeserializeDictionary(content);
         }
 
@@ -136,6 +140,10 @@ internal ProviderActionsTriggerEvaluationAcceptedResponseHeaders(global::System.
             {
                 ((Microsoft.Azure.PowerShell.Cmdlets.AppComplianceAutomation.Models.IProviderActionsTriggerEvaluationAcceptedResponseHeadersInternal)this).Location = (string) content.GetValueForProperty("Location",((Microsoft.Azure.PowerShell.Cmdlets.AppComplianceAutomation.Models.IProviderActionsTriggerEvaluationAcceptedResponseHeadersInternal)this).Location, global::System.Convert.ToString);
             }
+            if (content.Contains("RetryAfter"))
+            {
+                ((Microsoft.Azure.PowerShell.Cmdlets.AppComplianceAutomation.Models.IProviderActionsTriggerEvaluationAcceptedResponseHeadersInternal)this).RetryAfter = (int?) content.GetValueForProperty("RetryAfter",((Microsoft.Azure.PowerShell.Cmdlets.AppComplianceAutomation.Models.IProviderActionsTriggerEvaluationAcceptedResponseHeadersInternal)this).RetryAfter, (__y)=> (int) global::System.Convert.ChangeType(__y, typeof(int)));
+            }
             AfterDeserializePSObject(content);
         }
 
diff --git a/tests-upgrade/tests-emitter/AppComplianceAutomation.Management/target/generated/api/Models/ProviderActionsTriggerEvaluationAcceptedResponseHeaders.cs b/tests-upgrade/tests-emitter/AppComplianceAutomation.Management/target/generated/api/Models/ProviderActionsTriggerEvaluationAcceptedResponseHeaders.cs
@@ -17,13 +17,23 @@ public partial class ProviderActionsTriggerEvaluationAcceptedResponseHeaders :
         [Microsoft.Azure.PowerShell.Cmdlets.AppComplianceAutomation.Origin(Microsoft.Azure.PowerShell.Cmdlets.AppComplianceAutomation.PropertyOrigin.Owned)]
         public string Location { get => this._location; set => this._location = value; }
 
+        /// <summary>Backing field for <see cref="RetryAfter" /> property.</summary>
+        private int? _retryAfter;
+
+        [Microsoft.Azure.PowerShell.Cmdlets.AppComplianceAutomation.Origin(Microsoft.Azure.PowerShell.Cmdlets.AppComplianceAutomation.PropertyOrigin.Owned)]
+        public int? RetryAfter { get => this._retryAfter; set => this._retryAfter = value; }
+
         /// <param name="headers"></param>
         void Microsoft.Azure.PowerShell.Cmdlets.AppComplianceAutomation.Runtime.IHeaderSerializable.ReadHeaders(global::System.Net.Http.Headers.HttpResponseHeaders headers)
         {
             if (headers.TryGetValues("Location", out var __locationHeader0))
             {
                 ((Microsoft.Azure.PowerShell.Cmdlets.AppComplianceAutomation.Models.IProviderActionsTriggerEvaluationAcceptedResponseHeadersInternal)this).Location = System.Linq.Enumerable.FirstOrDefault(__locationHeader0) is string __headerLocationHeader0 ? __headerLocationHeader0 : (string)null;
             }
+            if (headers.TryGetValues("Retry-After", out var __retryAfterHeader1))
+            {
+                ((Microsoft.Azure.PowerShell.Cmdlets.AppComplianceAutomation.Models.IProviderActionsTriggerEvaluationAcceptedResponseHeadersInternal)this).RetryAfter = System.Linq.Enumerable.FirstOrDefault(__retryAfterHeader1) is string __headerRetryAfterHeader1 ? int.TryParse( __headerRetryAfterHeader1, out int __headerRetryAfterHeader1Value ) ? __headerRetryAfterHeader1Value : default(int?) : default(int?);
+            }
         }
 
         /// <summary>
@@ -48,11 +58,24 @@ public partial interface IProviderActionsTriggerEvaluationAcceptedResponseHeader
         PossibleTypes = new [] { typeof(string) })]
         string Location { get; set; }
 
+        [Microsoft.Azure.PowerShell.Cmdlets.AppComplianceAutomation.Runtime.Info(
+        Required = false,
+        ReadOnly = false,
+        Read = true,
+        Create = true,
+        Update = true,
+        Description = @"",
+        SerializedName = @"Retry-After",
+        PossibleTypes = new [] { typeof(int) })]
+        int? RetryAfter { get; set; }
+
     }
     internal partial interface IProviderActionsTriggerEvaluationAcceptedResponseHeadersInternal
 
     {
         string Location { get; set; }
 
+        int? RetryAfter { get; set; }
+
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -115,6 +115,10 @@ internal ProviderActionsOnboardAcceptedResponseHeaders(global::System.Collection`
`115`	`115`	`{`
`116`	`116`	`((Microsoft.Azure.PowerShell.Cmdlets.AppComplianceAutomation.Models.IProviderActionsOnboardAcceptedResponseHeadersInternal)this).Location = (string) content.GetValueForProperty("Location",((Microsoft.Azure.PowerShell.Cmdlets.AppComplianceAutomation.Models.IProviderActionsOnboardAcceptedResponseHeadersInternal)this).Location, global::System.Convert.ToString);`
`117`	`117`	`}`
	`118`	`+ if (content.Contains("RetryAfter"))`
	`119`	`+ {`
	`120`	`+ ((Microsoft.Azure.PowerShell.Cmdlets.AppComplianceAutomation.Models.IProviderActionsOnboardAcceptedResponseHeadersInternal)this).RetryAfter = (int?) content.GetValueForProperty("RetryAfter",((Microsoft.Azure.PowerShell.Cmdlets.AppComplianceAutomation.Models.IProviderActionsOnboardAcceptedResponseHeadersInternal)this).RetryAfter, (__y)=> (int) global::System.Convert.ChangeType(__y, typeof(int)));`
	`121`	`+ }`
`118`	`122`	`AfterDeserializeDictionary(content);`
`119`	`123`	`}`
`120`	`124`
`@@ -136,6 +140,10 @@ internal ProviderActionsOnboardAcceptedResponseHeaders(global::System.Management`
`136`	`140`	`{`
`137`	`141`	`((Microsoft.Azure.PowerShell.Cmdlets.AppComplianceAutomation.Models.IProviderActionsOnboardAcceptedResponseHeadersInternal)this).Location = (string) content.GetValueForProperty("Location",((Microsoft.Azure.PowerShell.Cmdlets.AppComplianceAutomation.Models.IProviderActionsOnboardAcceptedResponseHeadersInternal)this).Location, global::System.Convert.ToString);`
`138`	`142`	`}`
	`143`	`+ if (content.Contains("RetryAfter"))`
	`144`	`+ {`
	`145`	`+ ((Microsoft.Azure.PowerShell.Cmdlets.AppComplianceAutomation.Models.IProviderActionsOnboardAcceptedResponseHeadersInternal)this).RetryAfter = (int?) content.GetValueForProperty("RetryAfter",((Microsoft.Azure.PowerShell.Cmdlets.AppComplianceAutomation.Models.IProviderActionsOnboardAcceptedResponseHeadersInternal)this).RetryAfter, (__y)=> (int) global::System.Convert.ChangeType(__y, typeof(int)));`
	`146`	`+ }`
`139`	`147`	`AfterDeserializePSObject(content);`
`140`	`148`	`}`
`141`	`149`
Original file line number	Diff line number	Diff line change
`@@ -17,13 +17,23 @@ public partial class ProviderActionsOnboardAcceptedResponseHeaders :`
`17`	`17`	`[Microsoft.Azure.PowerShell.Cmdlets.AppComplianceAutomation.Origin(Microsoft.Azure.PowerShell.Cmdlets.AppComplianceAutomation.PropertyOrigin.Owned)]`
`18`	`18`	`public string Location { get => this._location; set => this._location = value; }`
`19`	`19`
	`20`	`+ /// <summary>Backing field for <see cref="RetryAfter" /> property.</summary>`
	`21`	`+ private int? _retryAfter;`
	`22`	`+`
	`23`	`+ [Microsoft.Azure.PowerShell.Cmdlets.AppComplianceAutomation.Origin(Microsoft.Azure.PowerShell.Cmdlets.AppComplianceAutomation.PropertyOrigin.Owned)]`
	`24`	`+ public int? RetryAfter { get => this._retryAfter; set => this._retryAfter = value; }`
	`25`	`+`
`20`	`26`	`/// <param name="headers"></param>`
`21`	`27`	`void Microsoft.Azure.PowerShell.Cmdlets.AppComplianceAutomation.Runtime.IHeaderSerializable.ReadHeaders(global::System.Net.Http.Headers.HttpResponseHeaders headers)`
`22`	`28`	`{`
`23`	`29`	`if (headers.TryGetValues("Location", out var __locationHeader0))`
`24`	`30`	`{`
`25`	`31`	`((Microsoft.Azure.PowerShell.Cmdlets.AppComplianceAutomation.Models.IProviderActionsOnboardAcceptedResponseHeadersInternal)this).Location = System.Linq.Enumerable.FirstOrDefault(__locationHeader0) is string __headerLocationHeader0 ? __headerLocationHeader0 : (string)null;`
`26`	`32`	`}`
	`33`	`+ if (headers.TryGetValues("Retry-After", out var __retryAfterHeader1))`
	`34`	`+ {`
	`35`	`+ ((Microsoft.Azure.PowerShell.Cmdlets.AppComplianceAutomation.Models.IProviderActionsOnboardAcceptedResponseHeadersInternal)this).RetryAfter = System.Linq.Enumerable.FirstOrDefault(__retryAfterHeader1) is string __headerRetryAfterHeader1 ? int.TryParse( __headerRetryAfterHeader1, out int __headerRetryAfterHeader1Value ) ? __headerRetryAfterHeader1Value : default(int?) : default(int?);`
	`36`	`+ }`
`27`	`37`	`}`
`28`	`38`
`29`	`39`	`/// <summary>`
`@@ -48,11 +58,24 @@ public partial interface IProviderActionsOnboardAcceptedResponseHeaders`
`48`	`58`	`PossibleTypes = new [] { typeof(string) })]`
`49`	`59`	`string Location { get; set; }`
`50`	`60`
	`61`	`+ [Microsoft.Azure.PowerShell.Cmdlets.AppComplianceAutomation.Runtime.Info(`
	`62`	`+ Required = false,`
	`63`	`+ ReadOnly = false,`
	`64`	`+ Read = true,`
	`65`	`+ Create = true,`
	`66`	`+ Update = true,`
	`67`	`+ Description = @"",`
	`68`	`+ SerializedName = @"Retry-After",`
	`69`	`+ PossibleTypes = new [] { typeof(int) })]`
	`70`	`+ int? RetryAfter { get; set; }`
	`71`	`+`
`51`	`72`	`}`
`52`	`73`	`internal partial interface IProviderActionsOnboardAcceptedResponseHeadersInternal`
`53`	`74`
`54`	`75`	`{`
`55`	`76`	`string Location { get; set; }`
`56`	`77`
	`78`	`+ int? RetryAfter { get; set; }`
	`79`	`+`
`57`	`80`	`}`
`58`	`81`	`}`