Skip to content

Commit e7c6a08

Browse files
msq177msq177
committed
Merge branch 'feat/v0.0.167' into 'main'
feat: Generate from terraform provider v0.0.167 See merge request iaasng/pulumi-volcengine!58
2 parents d85603d + 0e7f4ca commit e7c6a08

29 files changed

Lines changed: 2682 additions & 996 deletions

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

Lines changed: 18 additions & 6 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.166
15+
github.com/volcengine/terraform-provider-volcengine v0.0.167
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.166 h1:/IDdzmfQegznUHB0t0WsVqT/Ax6oYgceBajWJ/9FOi8=
1799-
github.com/volcengine/terraform-provider-volcengine v0.0.166/go.mod h1:nHE+W7UPw526nvKfFuuUbxRPhzFOmz2Gt37FhaYXYnI=
1798+
github.com/volcengine/terraform-provider-volcengine v0.0.167 h1:GM3TT+ySCrsnoF14d6fdPIF+27zxIeVdprcatL4rF3w=
1799+
github.com/volcengine/terraform-provider-volcengine v0.0.167/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: 954 additions & 954 deletions
Large diffs are not rendered by default.

‎sdk/dotnet/Cloud_identity/PermissionSetAssignment.cs‎

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -78,6 +78,13 @@ namespace Pulumi.Volcengine.Cloud_identity
7878
[VolcengineResourceType("volcengine:cloud_identity/permissionSetAssignment:PermissionSetAssignment")]
7979
public partial class PermissionSetAssignment : global::Pulumi.CustomResource
8080
{
81+
/// <summary>
82+
/// The deprovision strategy when deleting the cloud identity permission set assignment. Valid values: `DeprovisionForLastPermissionSetOnAccount`, `None`. Default is `DeprovisionForLastPermissionSetOnAccount`.
83+
/// When the `deprovision_strategy` is `DeprovisionForLastPermissionSetOnAccount`, and the permission set assignment to be deleted is the last assignment for the same account, this option is used for the DeprovisionPermissionSet operation.
84+
/// </summary>
85+
[Output("deprovisionStrategy")]
86+
public Output<string?> DeprovisionStrategy { get; private set; } = null!;
87+
8188
/// <summary>
8289
/// The id of the cloud identity permission set.
8390
/// </summary>
@@ -149,6 +156,13 @@ public static PermissionSetAssignment Get(string name, Input<string> id, Permiss
149156

150157
public sealed class PermissionSetAssignmentArgs : global::Pulumi.ResourceArgs
151158
{
159+
/// <summary>
160+
/// The deprovision strategy when deleting the cloud identity permission set assignment. Valid values: `DeprovisionForLastPermissionSetOnAccount`, `None`. Default is `DeprovisionForLastPermissionSetOnAccount`.
161+
/// When the `deprovision_strategy` is `DeprovisionForLastPermissionSetOnAccount`, and the permission set assignment to be deleted is the last assignment for the same account, this option is used for the DeprovisionPermissionSet operation.
162+
/// </summary>
163+
[Input("deprovisionStrategy")]
164+
public Input<string>? DeprovisionStrategy { get; set; }
165+
152166
/// <summary>
153167
/// The id of the cloud identity permission set.
154168
/// </summary>
@@ -181,6 +195,13 @@ public PermissionSetAssignmentArgs()
181195

182196
public sealed class PermissionSetAssignmentState : global::Pulumi.ResourceArgs
183197
{
198+
/// <summary>
199+
/// The deprovision strategy when deleting the cloud identity permission set assignment. Valid values: `DeprovisionForLastPermissionSetOnAccount`, `None`. Default is `DeprovisionForLastPermissionSetOnAccount`.
200+
/// When the `deprovision_strategy` is `DeprovisionForLastPermissionSetOnAccount`, and the permission set assignment to be deleted is the last assignment for the same account, this option is used for the DeprovisionPermissionSet operation.
201+
/// </summary>
202+
[Input("deprovisionStrategy")]
203+
public Input<string>? DeprovisionStrategy { get; set; }
204+
184205
/// <summary>
185206
/// The id of the cloud identity permission set.
186207
/// </summary>

‎sdk/dotnet/Cloud_identity/PermissionSetProvisioning.cs‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -59,17 +59,19 @@ namespace Pulumi.Volcengine.Cloud_identity
5959
/// var fooPermissionSetAssignment = new Volcengine.Cloud_identity.PermissionSetAssignment("fooPermissionSetAssignment", new()
6060
/// {
6161
/// PermissionSetId = fooPermissionSet.Id,
62-
/// TargetId = "210026****",
62+
/// TargetId = "210005****",
6363
/// PrincipalType = "User",
6464
/// PrincipalId = fooUser.Id,
65+
/// DeprovisionStrategy = "None",
6566
/// });
6667
///
68+
/// // It is not recommended to use this resource to provision the permission_set.
6769
/// // When the `volcengine_cloud_identity_permission_set` is updated, you can use this resource to provision the permission set.
68-
/// // When deleting this resource, resource `volcengine_cloud_identity_permission_set_assignment` must be deleted first.
70+
/// // When deleting this resource, resource `volcengine_cloud_identity_permission_set_assignment` must be deleted first, and the `deprovision_strategy` of `volcengine_cloud_identity_permission_set_assignment` should be set as `None`.
6971
/// var fooPermissionSetProvisioning = new Volcengine.Cloud_identity.PermissionSetProvisioning("fooPermissionSetProvisioning", new()
7072
/// {
7173
/// PermissionSetId = fooPermissionSet.Id,
72-
/// TargetId = "210026****",
74+
/// TargetId = "210005****",
7375
/// ProvisioningStatus = "Provisioned",
7476
/// });
7577
///

‎sdk/dotnet/Nas/FileSystem.cs‎

Lines changed: 80 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,86 @@ namespace Pulumi.Volcengine.Nas
1111
{
1212
/// <summary>
1313
/// Provides a resource to manage nas file system
14+
/// ## Example Usage
15+
///
16+
/// ```csharp
17+
/// using System.Collections.Generic;
18+
/// using System.Linq;
19+
/// using Pulumi;
20+
/// using Volcengine = Pulumi.Volcengine;
21+
///
22+
/// return await Deployment.RunAsync(() =&gt;
23+
/// {
24+
/// var fooZones = Volcengine.Nas.GetZones.Invoke();
25+
///
26+
/// // create nas file system
27+
/// var fooFileSystem = new Volcengine.Nas.FileSystem("fooFileSystem", new()
28+
/// {
29+
/// FileSystemName = "acc-test-fs",
30+
/// Description = "acc-test",
31+
/// ZoneId = fooZones.Apply(getZonesResult =&gt; getZonesResult.Zones[0]?.Id),
32+
/// Capacity = 103,
33+
/// ProjectName = "default",
34+
/// Tags = new[]
35+
/// {
36+
/// new Volcengine.Nas.Inputs.FileSystemTagArgs
37+
/// {
38+
/// Key = "k1",
39+
/// Value = "v1",
40+
/// },
41+
/// },
42+
/// });
43+
///
44+
/// // create vpc
45+
/// var fooVpc = new Volcengine.Vpc.Vpc("fooVpc", new()
46+
/// {
47+
/// VpcName = "acc-test-vpc",
48+
/// CidrBlock = "172.16.0.0/16",
49+
/// });
50+
///
51+
/// // create subnet
52+
/// var fooSubnet = new Volcengine.Vpc.Subnet("fooSubnet", new()
53+
/// {
54+
/// SubnetName = "acc-test-subnet",
55+
/// CidrBlock = "172.16.0.0/24",
56+
/// ZoneId = fooZones.Apply(getZonesResult =&gt; getZonesResult.Zones[0]?.Id),
57+
/// VpcId = fooVpc.Id,
58+
/// });
59+
///
60+
/// // create nas permission group
61+
/// var fooPermissionGroup = new Volcengine.Nas.PermissionGroup("fooPermissionGroup", new()
62+
/// {
63+
/// PermissionGroupName = "acc-test",
64+
/// Description = "acctest",
65+
/// PermissionRules = new[]
66+
/// {
67+
/// new Volcengine.Nas.Inputs.PermissionGroupPermissionRuleArgs
68+
/// {
69+
/// CidrIp = "*",
70+
/// RwMode = "RW",
71+
/// UseMode = "All_squash",
72+
/// },
73+
/// new Volcengine.Nas.Inputs.PermissionGroupPermissionRuleArgs
74+
/// {
75+
/// CidrIp = "192.168.0.0",
76+
/// RwMode = "RO",
77+
/// UseMode = "All_squash",
78+
/// },
79+
/// },
80+
/// });
81+
///
82+
/// // create nas mount point
83+
/// var fooMountPoint = new Volcengine.Nas.MountPoint("fooMountPoint", new()
84+
/// {
85+
/// FileSystemId = fooFileSystem.Id,
86+
/// MountPointName = "acc-test",
87+
/// PermissionGroupId = fooPermissionGroup.Id,
88+
/// SubnetId = fooSubnet.Id,
89+
/// });
90+
///
91+
/// });
92+
/// ```
93+
///
1494
/// ## Import
1595
///
1696
/// NasFileSystem can be imported using the id, e.g.

‎sdk/dotnet/Nas/GetMountPoints.cs‎

Lines changed: 160 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,12 +13,172 @@ public static class GetMountPoints
1313
{
1414
/// <summary>
1515
/// Use this data source to query detailed information of nas mount points
16+
/// ## Example Usage
17+
///
18+
/// ```csharp
19+
/// using System.Collections.Generic;
20+
/// using System.Linq;
21+
/// using Pulumi;
22+
/// using Volcengine = Pulumi.Volcengine;
23+
///
24+
/// return await Deployment.RunAsync(() =&gt;
25+
/// {
26+
/// var fooZones = Volcengine.Nas.GetZones.Invoke();
27+
///
28+
/// var fooVpc = new Volcengine.Vpc.Vpc("fooVpc", new()
29+
/// {
30+
/// VpcName = "acc-test-project1",
31+
/// CidrBlock = "172.16.0.0/16",
32+
/// });
33+
///
34+
/// var fooSubnet = new Volcengine.Vpc.Subnet("fooSubnet", new()
35+
/// {
36+
/// SubnetName = "acc-subnet-test-2",
37+
/// CidrBlock = "172.16.0.0/24",
38+
/// ZoneId = fooZones.Apply(getZonesResult =&gt; getZonesResult.Zones[0]?.Id),
39+
/// VpcId = fooVpc.Id,
40+
/// });
41+
///
42+
/// var fooPermissionGroup = new Volcengine.Nas.PermissionGroup("fooPermissionGroup", new()
43+
/// {
44+
/// PermissionGroupName = "acc-test",
45+
/// Description = "acctest",
46+
/// PermissionRules = new[]
47+
/// {
48+
/// new Volcengine.Nas.Inputs.PermissionGroupPermissionRuleArgs
49+
/// {
50+
/// CidrIp = "*",
51+
/// RwMode = "RW",
52+
/// UseMode = "All_squash",
53+
/// },
54+
/// new Volcengine.Nas.Inputs.PermissionGroupPermissionRuleArgs
55+
/// {
56+
/// CidrIp = "192.168.0.0",
57+
/// RwMode = "RO",
58+
/// UseMode = "All_squash",
59+
/// },
60+
/// },
61+
/// });
62+
///
63+
/// var fooFileSystem = new Volcengine.Nas.FileSystem("fooFileSystem", new()
64+
/// {
65+
/// FileSystemName = "acc-test-fs",
66+
/// Description = "acc-test",
67+
/// ZoneId = fooZones.Apply(getZonesResult =&gt; getZonesResult.Zones[0]?.Id),
68+
/// Capacity = 103,
69+
/// ProjectName = "default",
70+
/// Tags = new[]
71+
/// {
72+
/// new Volcengine.Nas.Inputs.FileSystemTagArgs
73+
/// {
74+
/// Key = "k1",
75+
/// Value = "v1",
76+
/// },
77+
/// },
78+
/// });
79+
///
80+
/// var fooMountPoint = new Volcengine.Nas.MountPoint("fooMountPoint", new()
81+
/// {
82+
/// FileSystemId = fooFileSystem.Id,
83+
/// MountPointName = "acc-test",
84+
/// PermissionGroupId = fooPermissionGroup.Id,
85+
/// SubnetId = fooSubnet.Id,
86+
/// });
87+
///
88+
/// var fooMountPoints = Volcengine.Nas.GetMountPoints.Invoke(new()
89+
/// {
90+
/// FileSystemId = fooFileSystem.Id,
91+
/// MountPointId = fooMountPoint.MountPointId,
92+
/// });
93+
///
94+
/// });
95+
/// ```
1696
/// </summary>
1797
public static Task<GetMountPointsResult> InvokeAsync(GetMountPointsArgs args, InvokeOptions? options = null)
1898
=> global::Pulumi.Deployment.Instance.InvokeAsync<GetMountPointsResult>("volcengine:nas/getMountPoints:getMountPoints", args ?? new GetMountPointsArgs(), options.WithDefaults());
1999

20100
/// <summary>
21101
/// Use this data source to query detailed information of nas mount points
102+
/// ## Example Usage
103+
///
104+
/// ```csharp
105+
/// using System.Collections.Generic;
106+
/// using System.Linq;
107+
/// using Pulumi;
108+
/// using Volcengine = Pulumi.Volcengine;
109+
///
110+
/// return await Deployment.RunAsync(() =&gt;
111+
/// {
112+
/// var fooZones = Volcengine.Nas.GetZones.Invoke();
113+
///
114+
/// var fooVpc = new Volcengine.Vpc.Vpc("fooVpc", new()
115+
/// {
116+
/// VpcName = "acc-test-project1",
117+
/// CidrBlock = "172.16.0.0/16",
118+
/// });
119+
///
120+
/// var fooSubnet = new Volcengine.Vpc.Subnet("fooSubnet", new()
121+
/// {
122+
/// SubnetName = "acc-subnet-test-2",
123+
/// CidrBlock = "172.16.0.0/24",
124+
/// ZoneId = fooZones.Apply(getZonesResult =&gt; getZonesResult.Zones[0]?.Id),
125+
/// VpcId = fooVpc.Id,
126+
/// });
127+
///
128+
/// var fooPermissionGroup = new Volcengine.Nas.PermissionGroup("fooPermissionGroup", new()
129+
/// {
130+
/// PermissionGroupName = "acc-test",
131+
/// Description = "acctest",
132+
/// PermissionRules = new[]
133+
/// {
134+
/// new Volcengine.Nas.Inputs.PermissionGroupPermissionRuleArgs
135+
/// {
136+
/// CidrIp = "*",
137+
/// RwMode = "RW",
138+
/// UseMode = "All_squash",
139+
/// },
140+
/// new Volcengine.Nas.Inputs.PermissionGroupPermissionRuleArgs
141+
/// {
142+
/// CidrIp = "192.168.0.0",
143+
/// RwMode = "RO",
144+
/// UseMode = "All_squash",
145+
/// },
146+
/// },
147+
/// });
148+
///
149+
/// var fooFileSystem = new Volcengine.Nas.FileSystem("fooFileSystem", new()
150+
/// {
151+
/// FileSystemName = "acc-test-fs",
152+
/// Description = "acc-test",
153+
/// ZoneId = fooZones.Apply(getZonesResult =&gt; getZonesResult.Zones[0]?.Id),
154+
/// Capacity = 103,
155+
/// ProjectName = "default",
156+
/// Tags = new[]
157+
/// {
158+
/// new Volcengine.Nas.Inputs.FileSystemTagArgs
159+
/// {
160+
/// Key = "k1",
161+
/// Value = "v1",
162+
/// },
163+
/// },
164+
/// });
165+
///
166+
/// var fooMountPoint = new Volcengine.Nas.MountPoint("fooMountPoint", new()
167+
/// {
168+
/// FileSystemId = fooFileSystem.Id,
169+
/// MountPointName = "acc-test",
170+
/// PermissionGroupId = fooPermissionGroup.Id,
171+
/// SubnetId = fooSubnet.Id,
172+
/// });
173+
///
174+
/// var fooMountPoints = Volcengine.Nas.GetMountPoints.Invoke(new()
175+
/// {
176+
/// FileSystemId = fooFileSystem.Id,
177+
/// MountPointId = fooMountPoint.MountPointId,
178+
/// });
179+
///
180+
/// });
181+
/// ```
22182
/// </summary>
23183
public static Output<GetMountPointsResult> Invoke(GetMountPointsInvokeArgs args, InvokeOptions? options = null)
24184
=> global::Pulumi.Deployment.Instance.Invoke<GetMountPointsResult>("volcengine:nas/getMountPoints:getMountPoints", args ?? new GetMountPointsInvokeArgs(), options.WithDefaults());

0 commit comments

Comments
 (0)