Skip to content

Commit 8049c14

Browse files
committed
Merge branch 'feat/v0.0.165' into 'main'
Generate from terraform provider v0.0.165 See merge request iaasng/pulumi-volcengine!56
2 parents 656828e + 7d0e374 commit 8049c14

139 files changed

Lines changed: 7387 additions & 865 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

provider/cmd/pulumi-resource-volcengine/schema.json

Lines changed: 599 additions & 25 deletions
Large diffs are not rendered by default.

provider/go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ require (
1212
github.com/hashicorp/terraform-plugin-sdk v1.9.1
1313
github.com/pulumi/pulumi-terraform-bridge/v3 v3.81.0
1414
github.com/pulumi/pulumi/sdk/v3 v3.113.0
15-
github.com/volcengine/terraform-provider-volcengine v0.0.164
15+
github.com/volcengine/terraform-provider-volcengine v0.0.165
1616
)
1717

1818
require (

provider/go.sum

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1795,8 +1795,8 @@ github.com/vmihailenco/msgpack/v5 v5.4.1/go.mod h1:GaZTsDaehaPpQVyxrf5mtQlH+pc21
17951795
github.com/vmihailenco/tagparser v0.1.1/go.mod h1:OeAg3pn3UbLjkWt+rN9oFYB6u/cQgqMEUPoW2WPyhdI=
17961796
github.com/vmihailenco/tagparser/v2 v2.0.0 h1:y09buUbR+b5aycVFQs/g70pqKVZNBmxwAhO7/IwNM9g=
17971797
github.com/vmihailenco/tagparser/v2 v2.0.0/go.mod h1:Wri+At7QHww0WTrCBeu4J6bNtoV6mEfg5OIWRZA9qds=
1798-
github.com/volcengine/terraform-provider-volcengine v0.0.164 h1:EMbDUDxc1VAD546OCrd9jWwnNxlCcsbhyLXbnCGBv88=
1799-
github.com/volcengine/terraform-provider-volcengine v0.0.164/go.mod h1:nHE+W7UPw526nvKfFuuUbxRPhzFOmz2Gt37FhaYXYnI=
1798+
github.com/volcengine/terraform-provider-volcengine v0.0.165 h1:uWk1Ds4suVljE+lGFdwdFTboqyWL6yWCpCAysWHdoGA=
1799+
github.com/volcengine/terraform-provider-volcengine v0.0.165/go.mod h1:nHE+W7UPw526nvKfFuuUbxRPhzFOmz2Gt37FhaYXYnI=
18001800
github.com/volcengine/volc-sdk-golang v1.0.23 h1:anOslb2Qp6ywnsbyq9jqR0ljuO63kg9PY+4OehIk5R8=
18011801
github.com/volcengine/volc-sdk-golang v1.0.23/go.mod h1:AfG/PZRUkHJ9inETvbjNifTDgut25Wbkm2QoYBTbvyU=
18021802
github.com/volcengine/volcengine-go-sdk v1.0.75 h1:FLNABNe7D5adaul3hLs4Co3oFC4xqIK5+QpKAdW/49Y=

provider/resources.go

Lines changed: 474 additions & 473 deletions
Large diffs are not rendered by default.

sdk/dotnet/Alb/Listener.cs

Lines changed: 109 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -21,35 +21,85 @@ namespace Pulumi.Volcengine.Alb
2121
///
2222
/// return await Deployment.RunAsync(() =>
2323
/// {
24-
/// var fooCustomizedCfg = new Volcengine.Alb.CustomizedCfg("fooCustomizedCfg", new()
24+
/// var fooZones = Volcengine.Ecs.Zones.Invoke();
25+
///
26+
/// var fooVpc = new Volcengine.Vpc.Vpc("fooVpc", new()
27+
/// {
28+
/// VpcName = "acc-test-vpc",
29+
/// CidrBlock = "172.16.0.0/16",
30+
/// });
31+
///
32+
/// var fooSubnet = new Volcengine.Vpc.Subnet("fooSubnet", new()
2533
/// {
26-
/// CustomizedCfgName = "acc-test-cfg1",
27-
/// Description = "This is a test modify",
28-
/// CustomizedCfgContent = "proxy_connect_timeout 4s;proxy_request_buffering on;",
34+
/// SubnetName = "acc-test-subnet",
35+
/// CidrBlock = "172.16.0.0/24",
36+
/// ZoneId = fooZones.Apply(zonesResult => zonesResult.Zones[0]?.Id),
37+
/// VpcId = fooVpc.Id,
38+
/// });
39+
///
40+
/// var fooAlb = new Volcengine.Alb.Alb("fooAlb", new()
41+
/// {
42+
/// AddressIpVersion = "IPv4",
43+
/// Type = "private",
44+
/// LoadBalancerName = "acc-test-alb-private",
45+
/// Description = "acc-test",
46+
/// SubnetIds = new[]
47+
/// {
48+
/// fooSubnet.Id,
49+
/// },
2950
/// ProjectName = "default",
51+
/// DeleteProtection = "off",
52+
/// Tags = new[]
53+
/// {
54+
/// new Volcengine.Alb.Inputs.AlbTagArgs
55+
/// {
56+
/// Key = "k1",
57+
/// Value = "v1",
58+
/// },
59+
/// },
60+
/// });
61+
///
62+
/// var fooServerGroup = new Volcengine.Alb.ServerGroup("fooServerGroup", new()
63+
/// {
64+
/// VpcId = fooVpc.Id,
65+
/// ServerGroupName = "acc-test-server-group",
66+
/// Description = "acc-test",
67+
/// ServerGroupType = "instance",
68+
/// Scheduler = "wlc",
69+
/// ProjectName = "default",
70+
/// HealthCheck = new Volcengine.Alb.Inputs.ServerGroupHealthCheckArgs
71+
/// {
72+
/// Enabled = "on",
73+
/// Interval = 3,
74+
/// Timeout = 3,
75+
/// Method = "GET",
76+
/// },
77+
/// StickySessionConfig = new Volcengine.Alb.Inputs.ServerGroupStickySessionConfigArgs
78+
/// {
79+
/// StickySessionEnabled = "on",
80+
/// StickySessionType = "insert",
81+
/// CookieTimeout = 1100,
82+
/// },
83+
/// });
84+
///
85+
/// var fooCertificate = new Volcengine.Alb.Certificate("fooCertificate", new()
86+
/// {
87+
/// Description = "tf-test",
88+
/// PublicKey = "public key",
89+
/// PrivateKey = "private key",
3090
/// });
3191
///
3292
/// var fooListener = new Volcengine.Alb.Listener("fooListener", new()
3393
/// {
34-
/// LoadBalancerId = "alb-1iidd17v3klj474adhfrunyz9",
35-
/// ListenerName = "acc-test-listener-1",
94+
/// LoadBalancerId = fooAlb.Id,
95+
/// ListenerName = "acc-test-listener",
3696
/// Protocol = "HTTPS",
3797
/// Port = 6666,
38-
/// Enabled = "on",
39-
/// CertificateId = "cert-1iidd2pahdyio74adhfr9ajwg",
40-
/// CaCertificateId = "cert-1iidd2r9ii0hs74adhfeodxo1",
41-
/// ServerGroupId = "rsp-1g72w74y4umf42zbhq4k4hnln",
42-
/// EnableHttp2 = "on",
43-
/// EnableQuic = "off",
44-
/// AclStatus = "on",
45-
/// AclType = "white",
46-
/// AclIds = new[]
47-
/// {
48-
/// "acl-1g72w6z11ighs2zbhq4v3rvh4",
49-
/// "acl-1g72xvtt7kg002zbhq5diim3s",
50-
/// },
98+
/// Enabled = "off",
99+
/// CertificateSource = "alb",
100+
/// CertificateId = fooCertificate.Id,
101+
/// ServerGroupId = fooServerGroup.Id,
51102
/// Description = "acc test listener",
52-
/// CustomizedCfgId = fooCustomizedCfg.Id,
53103
/// });
54104
///
55105
/// });
@@ -91,11 +141,23 @@ public partial class Listener : global::Pulumi.CustomResource
91141
public Output<string?> CaCertificateId { get; private set; } = null!;
92142

93143
/// <summary>
94-
/// The certificate id associated with the listener.
144+
/// The certificate id associated with the listener. Source is `cert_center`.
145+
/// </summary>
146+
[Output("certCenterCertificateId")]
147+
public Output<string?> CertCenterCertificateId { get; private set; } = null!;
148+
149+
/// <summary>
150+
/// The certificate id associated with the listener. Source is `alb`.
95151
/// </summary>
96152
[Output("certificateId")]
97153
public Output<string?> CertificateId { get; private set; } = null!;
98154

155+
/// <summary>
156+
/// The source of the certificate. Valid values: `alb`, `cert_center`. Default is `alb`.
157+
/// </summary>
158+
[Output("certificateSource")]
159+
public Output<string?> CertificateSource { get; private set; } = null!;
160+
99161
/// <summary>
100162
/// Personalized configuration ID, with a value of " " when not bound.
101163
/// </summary>
@@ -240,11 +302,23 @@ public InputList<string> AclIds
240302
public Input<string>? CaCertificateId { get; set; }
241303

242304
/// <summary>
243-
/// The certificate id associated with the listener.
305+
/// The certificate id associated with the listener. Source is `cert_center`.
306+
/// </summary>
307+
[Input("certCenterCertificateId")]
308+
public Input<string>? CertCenterCertificateId { get; set; }
309+
310+
/// <summary>
311+
/// The certificate id associated with the listener. Source is `alb`.
244312
/// </summary>
245313
[Input("certificateId")]
246314
public Input<string>? CertificateId { get; set; }
247315

316+
/// <summary>
317+
/// The source of the certificate. Valid values: `alb`, `cert_center`. Default is `alb`.
318+
/// </summary>
319+
[Input("certificateSource")]
320+
public Input<string>? CertificateSource { get; set; }
321+
248322
/// <summary>
249323
/// Personalized configuration ID, with a value of " " when not bound.
250324
/// </summary>
@@ -344,11 +418,23 @@ public InputList<string> AclIds
344418
public Input<string>? CaCertificateId { get; set; }
345419

346420
/// <summary>
347-
/// The certificate id associated with the listener.
421+
/// The certificate id associated with the listener. Source is `cert_center`.
422+
/// </summary>
423+
[Input("certCenterCertificateId")]
424+
public Input<string>? CertCenterCertificateId { get; set; }
425+
426+
/// <summary>
427+
/// The certificate id associated with the listener. Source is `alb`.
348428
/// </summary>
349429
[Input("certificateId")]
350430
public Input<string>? CertificateId { get; set; }
351431

432+
/// <summary>
433+
/// The source of the certificate. Valid values: `alb`, `cert_center`. Default is `alb`.
434+
/// </summary>
435+
[Input("certificateSource")]
436+
public Input<string>? CertificateSource { get; set; }
437+
352438
/// <summary>
353439
/// Personalized configuration ID, with a value of " " when not bound.
354440
/// </summary>

sdk/dotnet/Alb/Outputs/ListenersListenerResult.cs

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,10 +30,18 @@ public sealed class ListenersListenerResult
3030
/// </summary>
3131
public readonly string CaCertificateId;
3232
/// <summary>
33+
/// The certificate id associated with the listener. Source is `cert_center`.
34+
/// </summary>
35+
public readonly string CertCenterCertificateId;
36+
/// <summary>
3337
/// The server certificate ID that domain used.
3438
/// </summary>
3539
public readonly string CertificateId;
3640
/// <summary>
41+
/// The source of the certificate.
42+
/// </summary>
43+
public readonly string CertificateSource;
44+
/// <summary>
3745
/// The create time of the Listener.
3846
/// </summary>
3947
public readonly string CreateTime;
@@ -116,8 +124,12 @@ private ListenersListenerResult(
116124

117125
string caCertificateId,
118126

127+
string certCenterCertificateId,
128+
119129
string certificateId,
120130

131+
string certificateSource,
132+
121133
string createTime,
122134

123135
string customizedCfgId,
@@ -158,7 +170,9 @@ private ListenersListenerResult(
158170
AclStatus = aclStatus;
159171
AclType = aclType;
160172
CaCertificateId = caCertificateId;
173+
CertCenterCertificateId = certCenterCertificateId;
161174
CertificateId = certificateId;
175+
CertificateSource = certificateSource;
162176
CreateTime = createTime;
163177
CustomizedCfgId = customizedCfgId;
164178
Description = description;

sdk/dotnet/Cr/Endpoint.cs

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,12 @@ namespace Pulumi.Volcengine.Cr
4141
[VolcengineResourceType("volcengine:cr/endpoint:Endpoint")]
4242
public partial class Endpoint : global::Pulumi.CustomResource
4343
{
44+
/// <summary>
45+
/// The list of acl policies.
46+
/// </summary>
47+
[Output("aclPolicies")]
48+
public Output<ImmutableArray<Outputs.EndpointAclPolicy>> AclPolicies { get; private set; } = null!;
49+
4450
/// <summary>
4551
/// Whether enable public endpoint.
4652
/// </summary>
@@ -126,6 +132,18 @@ public EndpointArgs()
126132

127133
public sealed class EndpointState : global::Pulumi.ResourceArgs
128134
{
135+
[Input("aclPolicies")]
136+
private InputList<Inputs.EndpointAclPolicyGetArgs>? _aclPolicies;
137+
138+
/// <summary>
139+
/// The list of acl policies.
140+
/// </summary>
141+
public InputList<Inputs.EndpointAclPolicyGetArgs> AclPolicies
142+
{
143+
get => _aclPolicies ?? (_aclPolicies = new InputList<Inputs.EndpointAclPolicyGetArgs>());
144+
set => _aclPolicies = value;
145+
}
146+
129147
/// <summary>
130148
/// Whether enable public endpoint.
131149
/// </summary>

0 commit comments

Comments
 (0)