Skip to content

Commit

Permalink
[codegen]support extends parameters && disableHttp2 config
Browse files Browse the repository at this point in the history
  • Loading branch information
@yndu13
yndu13 committed May 13, 2024
1 parent c837849 commit 8d24275
Show file tree
Hide file tree
Showing 26 changed files with 816 additions and 46 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/go.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:
strategy:
fail-fast: false
matrix:
go: [1.13, 1.14, 1.15, 1.16]
go: ["1.13", "1.14", "1.15", "1.16", "1.17", "1.18", "1.19", "1.20", "1.21"]

steps:
- name: Set up Go 1.x
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/java.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ jobs:
fail-fast: false
matrix:
# test against latest update of each major Java version, as well as specific updates of LTS versions:
java: [7, 8, 9, 11, 12, 13, 14, 15, 16, 17]
java: [7, 8, 9, 11, 12, 13, 14, 15, 16, 17, 18, 19]

steps:
- uses: actions/checkout@v2
Expand Down
110 changes: 108 additions & 2 deletions csharp/core/Client.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@ public class Client
protected string _key;
protected string _cert;
protected string _ca;
protected bool? _disableHttp2;

/**
* Init client with Config
Expand Down Expand Up @@ -104,6 +105,7 @@ public Client(Config config)
this._key = config.Key;
this._cert = config.Cert;
this._ca = config.Ca;
this._disableHttp2 = config.DisableHttp2;
}

/**
Expand Down Expand Up @@ -183,6 +185,15 @@ public Dictionary<string, object> DoRPCRequest(string action, string version, st
globalHeaders = globalParams.Headers;
}
}
Dictionary<string, string> extendsHeaders = new Dictionary<string, string>(){};
if (!AlibabaCloud.TeaUtil.Common.IsUnset(runtime.ExtendsParameters))
{
AlibabaCloud.TeaUtil.Models.ExtendsParameters extendsParameters = runtime.ExtendsParameters;
if (!AlibabaCloud.TeaUtil.Common.IsUnset(extendsParameters.Headers))
{
extendsHeaders = extendsParameters.Headers;
}
}
request_.Query = TeaConverter.merge<string>
(
new Dictionary<string, string>()
Expand All @@ -209,7 +220,8 @@ public Dictionary<string, object> DoRPCRequest(string action, string version, st
{"x-acs-action", action},
{"user-agent", GetUserAgent()},
},
globalHeaders
globalHeaders,
extendsHeaders
);
}
else
Expand All @@ -224,6 +236,7 @@ public Dictionary<string, object> DoRPCRequest(string action, string version, st
{"user-agent", GetUserAgent()},
},
globalHeaders,
extendsHeaders,
headers
);
}
Expand Down Expand Up @@ -427,6 +440,15 @@ public async Task<Dictionary<string, object>> DoRPCRequestAsync(string action, s
globalHeaders = globalParams.Headers;
}
}
Dictionary<string, string> extendsHeaders = new Dictionary<string, string>(){};
if (!AlibabaCloud.TeaUtil.Common.IsUnset(runtime.ExtendsParameters))
{
AlibabaCloud.TeaUtil.Models.ExtendsParameters extendsParameters = runtime.ExtendsParameters;
if (!AlibabaCloud.TeaUtil.Common.IsUnset(extendsParameters.Headers))
{
extendsHeaders = extendsParameters.Headers;
}
}
request_.Query = TeaConverter.merge<string>
(
new Dictionary<string, string>()
Expand All @@ -453,7 +475,8 @@ public async Task<Dictionary<string, object>> DoRPCRequestAsync(string action, s
{"x-acs-action", action},
{"user-agent", GetUserAgent()},
},
globalHeaders
globalHeaders,
extendsHeaders
);
}
else
Expand All @@ -468,6 +491,7 @@ public async Task<Dictionary<string, object>> DoRPCRequestAsync(string action, s
{"user-agent", GetUserAgent()},
},
globalHeaders,
extendsHeaders,
headers
);
}
Expand Down Expand Up @@ -672,6 +696,15 @@ public Dictionary<string, object> DoROARequest(string action, string version, st
globalHeaders = globalParams.Headers;
}
}
Dictionary<string, string> extendsHeaders = new Dictionary<string, string>(){};
if (!AlibabaCloud.TeaUtil.Common.IsUnset(runtime.ExtendsParameters))
{
AlibabaCloud.TeaUtil.Models.ExtendsParameters extendsParameters = runtime.ExtendsParameters;
if (!AlibabaCloud.TeaUtil.Common.IsUnset(extendsParameters.Headers))
{
extendsHeaders = extendsParameters.Headers;
}
}
request_.Headers = TeaConverter.merge<string>
(
new Dictionary<string, string>()
Expand All @@ -687,6 +720,7 @@ public Dictionary<string, object> DoROARequest(string action, string version, st
{"user-agent", AlibabaCloud.TeaUtil.Common.GetUserAgent(_userAgent)},
},
globalHeaders,
extendsHeaders,
request.Headers
);
if (!AlibabaCloud.TeaUtil.Common.IsUnset(request.Body))
Expand Down Expand Up @@ -894,6 +928,15 @@ public async Task<Dictionary<string, object>> DoROARequestAsync(string action, s
globalHeaders = globalParams.Headers;
}
}
Dictionary<string, string> extendsHeaders = new Dictionary<string, string>(){};
if (!AlibabaCloud.TeaUtil.Common.IsUnset(runtime.ExtendsParameters))
{
AlibabaCloud.TeaUtil.Models.ExtendsParameters extendsParameters = runtime.ExtendsParameters;
if (!AlibabaCloud.TeaUtil.Common.IsUnset(extendsParameters.Headers))
{
extendsHeaders = extendsParameters.Headers;
}
}
request_.Headers = TeaConverter.merge<string>
(
new Dictionary<string, string>()
Expand All @@ -909,6 +952,7 @@ public async Task<Dictionary<string, object>> DoROARequestAsync(string action, s
{"user-agent", AlibabaCloud.TeaUtil.Common.GetUserAgent(_userAgent)},
},
globalHeaders,
extendsHeaders,
request.Headers
);
if (!AlibabaCloud.TeaUtil.Common.IsUnset(request.Body))
Expand Down Expand Up @@ -1116,6 +1160,15 @@ public Dictionary<string, object> DoROARequestWithForm(string action, string ver
globalHeaders = globalParams.Headers;
}
}
Dictionary<string, string> extendsHeaders = new Dictionary<string, string>(){};
if (!AlibabaCloud.TeaUtil.Common.IsUnset(runtime.ExtendsParameters))
{
AlibabaCloud.TeaUtil.Models.ExtendsParameters extendsParameters = runtime.ExtendsParameters;
if (!AlibabaCloud.TeaUtil.Common.IsUnset(extendsParameters.Headers))
{
extendsHeaders = extendsParameters.Headers;
}
}
request_.Headers = TeaConverter.merge<string>
(
new Dictionary<string, string>()
Expand All @@ -1131,6 +1184,7 @@ public Dictionary<string, object> DoROARequestWithForm(string action, string ver
{"user-agent", AlibabaCloud.TeaUtil.Common.GetUserAgent(_userAgent)},
},
globalHeaders,
extendsHeaders,
request.Headers
);
if (!AlibabaCloud.TeaUtil.Common.IsUnset(request.Body))
Expand Down Expand Up @@ -1337,6 +1391,15 @@ public async Task<Dictionary<string, object>> DoROARequestWithFormAsync(string a
globalHeaders = globalParams.Headers;
}
}
Dictionary<string, string> extendsHeaders = new Dictionary<string, string>(){};
if (!AlibabaCloud.TeaUtil.Common.IsUnset(runtime.ExtendsParameters))
{
AlibabaCloud.TeaUtil.Models.ExtendsParameters extendsParameters = runtime.ExtendsParameters;
if (!AlibabaCloud.TeaUtil.Common.IsUnset(extendsParameters.Headers))
{
extendsHeaders = extendsParameters.Headers;
}
}
request_.Headers = TeaConverter.merge<string>
(
new Dictionary<string, string>()
Expand All @@ -1352,6 +1415,7 @@ public async Task<Dictionary<string, object>> DoROARequestWithFormAsync(string a
{"user-agent", AlibabaCloud.TeaUtil.Common.GetUserAgent(_userAgent)},
},
globalHeaders,
extendsHeaders,
request.Headers
);
if (!AlibabaCloud.TeaUtil.Common.IsUnset(request.Body))
Expand Down Expand Up @@ -1558,6 +1622,15 @@ public Dictionary<string, object> DoRequest(Params params_, OpenApiRequest reque
globalHeaders = globalParams.Headers;
}
}
Dictionary<string, string> extendsHeaders = new Dictionary<string, string>(){};
if (!AlibabaCloud.TeaUtil.Common.IsUnset(runtime.ExtendsParameters))
{
AlibabaCloud.TeaUtil.Models.ExtendsParameters extendsParameters = runtime.ExtendsParameters;
if (!AlibabaCloud.TeaUtil.Common.IsUnset(extendsParameters.Headers))
{
extendsHeaders = extendsParameters.Headers;
}
}
request_.Query = TeaConverter.merge<string>
(
globalQueries,
Expand All @@ -1577,6 +1650,7 @@ public Dictionary<string, object> DoRequest(Params params_, OpenApiRequest reque
{"accept", "application/json"},
},
globalHeaders,
extendsHeaders,
request.Headers
);
if (AlibabaCloud.TeaUtil.Common.EqualString(params_.Style, "RPC"))
Expand Down Expand Up @@ -1830,6 +1904,15 @@ public async Task<Dictionary<string, object>> DoRequestAsync(Params params_, Ope
globalHeaders = globalParams.Headers;
}
}
Dictionary<string, string> extendsHeaders = new Dictionary<string, string>(){};
if (!AlibabaCloud.TeaUtil.Common.IsUnset(runtime.ExtendsParameters))
{
AlibabaCloud.TeaUtil.Models.ExtendsParameters extendsParameters = runtime.ExtendsParameters;
if (!AlibabaCloud.TeaUtil.Common.IsUnset(extendsParameters.Headers))
{
extendsHeaders = extendsParameters.Headers;
}
}
request_.Query = TeaConverter.merge<string>
(
globalQueries,
Expand All @@ -1849,6 +1932,7 @@ public async Task<Dictionary<string, object>> DoRequestAsync(Params params_, Ope
{"accept", "application/json"},
},
globalHeaders,
extendsHeaders,
request.Headers
);
if (AlibabaCloud.TeaUtil.Common.EqualString(params_.Style, "RPC"))
Expand Down Expand Up @@ -2065,6 +2149,7 @@ public Dictionary<string, object> Execute(Params params_, OpenApiRequest request
{"period", AlibabaCloud.TeaUtil.Common.DefaultNumber(runtime.BackoffPeriod, 1)},
}},
{"ignoreSSL", runtime.IgnoreSSL},
{"disableHttp2", DefaultAny(_disableHttp2.Value, false)},
};

TeaRequest _lastRequest = null;
Expand Down Expand Up @@ -2101,11 +2186,21 @@ public Dictionary<string, object> Execute(Params params_, OpenApiRequest request
globalHeaders = globalParams.Headers;
}
}
Dictionary<string, string> extendsHeaders = new Dictionary<string, string>(){};
if (!AlibabaCloud.TeaUtil.Common.IsUnset(runtime.ExtendsParameters))
{
AlibabaCloud.TeaUtil.Models.ExtendsParameters extendsParameters = runtime.ExtendsParameters;
if (!AlibabaCloud.TeaUtil.Common.IsUnset(extendsParameters.Headers))
{
extendsHeaders = extendsParameters.Headers;
}
}
AlibabaCloud.GatewaySpi.Models.InterceptorContext.InterceptorContextRequest requestContext = new AlibabaCloud.GatewaySpi.Models.InterceptorContext.InterceptorContextRequest
{
Headers = TeaConverter.merge<string>
(
globalHeaders,
extendsHeaders,
request.Headers,
headers
),
Expand Down Expand Up @@ -2232,6 +2327,7 @@ public async Task<Dictionary<string, object>> ExecuteAsync(Params params_, OpenA
{"period", AlibabaCloud.TeaUtil.Common.DefaultNumber(runtime.BackoffPeriod, 1)},
}},
{"ignoreSSL", runtime.IgnoreSSL},
{"disableHttp2", DefaultAny(_disableHttp2.Value, false)},
};

TeaRequest _lastRequest = null;
Expand Down Expand Up @@ -2268,11 +2364,21 @@ public async Task<Dictionary<string, object>> ExecuteAsync(Params params_, OpenA
globalHeaders = globalParams.Headers;
}
}
Dictionary<string, string> extendsHeaders = new Dictionary<string, string>(){};
if (!AlibabaCloud.TeaUtil.Common.IsUnset(runtime.ExtendsParameters))
{
AlibabaCloud.TeaUtil.Models.ExtendsParameters extendsParameters = runtime.ExtendsParameters;
if (!AlibabaCloud.TeaUtil.Common.IsUnset(extendsParameters.Headers))
{
extendsHeaders = extendsParameters.Headers;
}
}
AlibabaCloud.GatewaySpi.Models.InterceptorContext.InterceptorContextRequest requestContext = new AlibabaCloud.GatewaySpi.Models.InterceptorContext.InterceptorContextRequest
{
Headers = TeaConverter.merge<string>
(
globalHeaders,
extendsHeaders,
request.Headers,
headers
),
Expand Down
7 changes: 7 additions & 0 deletions csharp/core/Models/Config.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -209,6 +209,13 @@ public class Config : TeaModel {
[Validation(Required=false)]
public string Ca { get; set; }

/// <summary>
/// disable HTTP/2
/// </summary>
[NameInMap("disableHttp2")]
[Validation(Required=false)]
public bool? DisableHttp2 { get; set; }

}

}
2 changes: 1 addition & 1 deletion csharp/core/client.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
</PackageReference>
<PackageReference Include="AlibabaCloud.TeaUtil" Version="0.1.17"/>
<PackageReference Include="AlibabaCloud.TeaUtil" Version="0.1.18"/>
<PackageReference Include="Aliyun.Credentials" Version="1.3.2"/>
<PackageReference Include="AlibabaCloud.OpenApiUtil" Version="1.1.1"/>
<PackageReference Include="Tea" Version="1.0.11"/>
Expand Down
Loading

0 comments on commit 8d24275

Please sign in to comment.