Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Tsp - Merge headers from different content types #1420

Merged
merged 1 commit into from
Dec 25, 2024
Merged

Tsp - Merge headers from different content types #1420

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 21 additions & 11 deletions packages/typespec-powershell/src/convertor/convertor.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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];
Expand Down
8 changes: 8 additions & 0 deletions ...t/target/generated/api/Models/ProviderActionsOnboardAcceptedResponseHeaders.PowerShell.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}

Expand All @@ -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);
}

Expand Down
23 changes: 23 additions & 0 deletions ...n.Management/target/generated/api/Models/ProviderActionsOnboardAcceptedResponseHeaders.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand All @@ -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; }

}
}
8 changes: 8 additions & 0 deletions ...enerated/api/Models/ProviderActionsTriggerEvaluationAcceptedResponseHeaders.PowerShell.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}

Expand All @@ -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);
}

Expand Down
23 changes: 23 additions & 0 deletions ...nt/target/generated/api/Models/ProviderActionsTriggerEvaluationAcceptedResponseHeaders.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand All @@ -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; }

}
}
Loading