filtersConfigs() {
diff --git a/sdk/java/src/main/java/com/pulumi/aws/iam/OrganizationsFeatures.java b/sdk/java/src/main/java/com/pulumi/aws/iam/OrganizationsFeatures.java
new file mode 100644
index 00000000000..7eb92d2c80c
--- /dev/null
+++ b/sdk/java/src/main/java/com/pulumi/aws/iam/OrganizationsFeatures.java
@@ -0,0 +1,147 @@
+// *** WARNING: this file was generated by pulumi-java-gen. ***
+// *** Do not edit by hand unless you're certain you know what you are doing! ***
+
+package com.pulumi.aws.iam;
+
+import com.pulumi.aws.Utilities;
+import com.pulumi.aws.iam.OrganizationsFeaturesArgs;
+import com.pulumi.aws.iam.inputs.OrganizationsFeaturesState;
+import com.pulumi.core.Output;
+import com.pulumi.core.annotations.Export;
+import com.pulumi.core.annotations.ResourceType;
+import com.pulumi.core.internal.Codegen;
+import java.lang.String;
+import java.util.List;
+import javax.annotation.Nullable;
+
+/**
+ * Manages centralized root access features across AWS member accounts managed using AWS Organizations. More information about managing root access in IAM can be found in the [Centralize root access for member accounts](https://docs.aws.amazon.com/IAM/latest/UserGuide/id_root-enable-root-access.html).
+ *
+ * > **NOTE:** The AWS account utilizing this resource must be an Organizations management account. Also, you must enable trusted access for AWS Identity and Access Management in AWS Organizations.
+ *
+ * ## Example Usage
+ *
+ * <!--Start PulumiCodeChooser -->
+ *
+ * {@code
+ * package generated_program;
+ *
+ * import com.pulumi.Context;
+ * import com.pulumi.Pulumi;
+ * import com.pulumi.core.Output;
+ * import com.pulumi.aws.organizations.Organization;
+ * import com.pulumi.aws.organizations.OrganizationArgs;
+ * import com.pulumi.aws.iam.OrganizationsFeatures;
+ * import com.pulumi.aws.iam.OrganizationsFeaturesArgs;
+ * import java.util.List;
+ * import java.util.ArrayList;
+ * import java.util.Map;
+ * import java.io.File;
+ * import java.nio.file.Files;
+ * import java.nio.file.Paths;
+ *
+ * public class App {
+ * public static void main(String[] args) {
+ * Pulumi.run(App::stack);
+ * }
+ *
+ * public static void stack(Context ctx) {
+ * var example = new Organization("example", OrganizationArgs.builder()
+ * .awsServiceAccessPrincipals("iam.amazonaws.com")
+ * .featureSet("ALL")
+ * .build());
+ *
+ * var exampleOrganizationsFeatures = new OrganizationsFeatures("exampleOrganizationsFeatures", OrganizationsFeaturesArgs.builder()
+ * .enabledFeatures(
+ * "RootCredentialsManagement",
+ * "RootSessions")
+ * .build());
+ *
+ * }
+ * }
+ * }
+ *
+ * <!--End PulumiCodeChooser -->
+ *
+ * ## Import
+ *
+ * Using `pulumi import`, import root access features using the `id`. For example:
+ *
+ * ```sh
+ * $ pulumi import aws:iam/organizationsFeatures:OrganizationsFeatures example o-1234567
+ * ```
+ *
+ */
+@ResourceType(type="aws:iam/organizationsFeatures:OrganizationsFeatures")
+public class OrganizationsFeatures extends com.pulumi.resources.CustomResource {
+ /**
+ * List of IAM features to enable. Valid values are `RootCredentialsManagement` and `RootSessions`.
+ *
+ */
+ @Export(name="enabledFeatures", refs={List.class,String.class}, tree="[0,1]")
+ private Output> enabledFeatures;
+
+ /**
+ * @return List of IAM features to enable. Valid values are `RootCredentialsManagement` and `RootSessions`.
+ *
+ */
+ public Output> enabledFeatures() {
+ return this.enabledFeatures;
+ }
+
+ /**
+ *
+ * @param name The _unique_ name of the resulting resource.
+ */
+ public OrganizationsFeatures(java.lang.String name) {
+ this(name, OrganizationsFeaturesArgs.Empty);
+ }
+ /**
+ *
+ * @param name The _unique_ name of the resulting resource.
+ * @param args The arguments to use to populate this resource's properties.
+ */
+ public OrganizationsFeatures(java.lang.String name, OrganizationsFeaturesArgs args) {
+ this(name, args, null);
+ }
+ /**
+ *
+ * @param name The _unique_ name of the resulting resource.
+ * @param args The arguments to use to populate this resource's properties.
+ * @param options A bag of options that control this resource's behavior.
+ */
+ public OrganizationsFeatures(java.lang.String name, OrganizationsFeaturesArgs args, @Nullable com.pulumi.resources.CustomResourceOptions options) {
+ super("aws:iam/organizationsFeatures:OrganizationsFeatures", name, makeArgs(args, options), makeResourceOptions(options, Codegen.empty()), false);
+ }
+
+ private OrganizationsFeatures(java.lang.String name, Output id, @Nullable OrganizationsFeaturesState state, @Nullable com.pulumi.resources.CustomResourceOptions options) {
+ super("aws:iam/organizationsFeatures:OrganizationsFeatures", name, state, makeResourceOptions(options, id), false);
+ }
+
+ private static OrganizationsFeaturesArgs makeArgs(OrganizationsFeaturesArgs args, @Nullable com.pulumi.resources.CustomResourceOptions options) {
+ if (options != null && options.getUrn().isPresent()) {
+ return null;
+ }
+ return args == null ? OrganizationsFeaturesArgs.Empty : args;
+ }
+
+ private static com.pulumi.resources.CustomResourceOptions makeResourceOptions(@Nullable com.pulumi.resources.CustomResourceOptions options, @Nullable Output id) {
+ var defaultOptions = com.pulumi.resources.CustomResourceOptions.builder()
+ .version(Utilities.getVersion())
+ .build();
+ return com.pulumi.resources.CustomResourceOptions.merge(defaultOptions, options, id);
+ }
+
+ /**
+ * Get an existing Host resource's state with the given name, ID, and optional extra
+ * properties used to qualify the lookup.
+ *
+ * @param name The _unique_ name of the resulting resource.
+ * @param id The _unique_ provider ID of the resource to lookup.
+ * @param state
+ * @param options Optional settings to control the behavior of the CustomResource.
+ */
+ public static OrganizationsFeatures get(java.lang.String name, Output id, @Nullable OrganizationsFeaturesState state, @Nullable com.pulumi.resources.CustomResourceOptions options) {
+ return new OrganizationsFeatures(name, id, state, options);
+ }
+}
diff --git a/sdk/java/src/main/java/com/pulumi/aws/iam/OrganizationsFeaturesArgs.java b/sdk/java/src/main/java/com/pulumi/aws/iam/OrganizationsFeaturesArgs.java
new file mode 100644
index 00000000000..c6bf00be30a
--- /dev/null
+++ b/sdk/java/src/main/java/com/pulumi/aws/iam/OrganizationsFeaturesArgs.java
@@ -0,0 +1,96 @@
+// *** WARNING: this file was generated by pulumi-java-gen. ***
+// *** Do not edit by hand unless you're certain you know what you are doing! ***
+
+package com.pulumi.aws.iam;
+
+import com.pulumi.core.Output;
+import com.pulumi.core.annotations.Import;
+import com.pulumi.exceptions.MissingRequiredPropertyException;
+import java.lang.String;
+import java.util.List;
+import java.util.Objects;
+
+
+public final class OrganizationsFeaturesArgs extends com.pulumi.resources.ResourceArgs {
+
+ public static final OrganizationsFeaturesArgs Empty = new OrganizationsFeaturesArgs();
+
+ /**
+ * List of IAM features to enable. Valid values are `RootCredentialsManagement` and `RootSessions`.
+ *
+ */
+ @Import(name="enabledFeatures", required=true)
+ private Output> enabledFeatures;
+
+ /**
+ * @return List of IAM features to enable. Valid values are `RootCredentialsManagement` and `RootSessions`.
+ *
+ */
+ public Output> enabledFeatures() {
+ return this.enabledFeatures;
+ }
+
+ private OrganizationsFeaturesArgs() {}
+
+ private OrganizationsFeaturesArgs(OrganizationsFeaturesArgs $) {
+ this.enabledFeatures = $.enabledFeatures;
+ }
+
+ public static Builder builder() {
+ return new Builder();
+ }
+ public static Builder builder(OrganizationsFeaturesArgs defaults) {
+ return new Builder(defaults);
+ }
+
+ public static final class Builder {
+ private OrganizationsFeaturesArgs $;
+
+ public Builder() {
+ $ = new OrganizationsFeaturesArgs();
+ }
+
+ public Builder(OrganizationsFeaturesArgs defaults) {
+ $ = new OrganizationsFeaturesArgs(Objects.requireNonNull(defaults));
+ }
+
+ /**
+ * @param enabledFeatures List of IAM features to enable. Valid values are `RootCredentialsManagement` and `RootSessions`.
+ *
+ * @return builder
+ *
+ */
+ public Builder enabledFeatures(Output> enabledFeatures) {
+ $.enabledFeatures = enabledFeatures;
+ return this;
+ }
+
+ /**
+ * @param enabledFeatures List of IAM features to enable. Valid values are `RootCredentialsManagement` and `RootSessions`.
+ *
+ * @return builder
+ *
+ */
+ public Builder enabledFeatures(List enabledFeatures) {
+ return enabledFeatures(Output.of(enabledFeatures));
+ }
+
+ /**
+ * @param enabledFeatures List of IAM features to enable. Valid values are `RootCredentialsManagement` and `RootSessions`.
+ *
+ * @return builder
+ *
+ */
+ public Builder enabledFeatures(String... enabledFeatures) {
+ return enabledFeatures(List.of(enabledFeatures));
+ }
+
+ public OrganizationsFeaturesArgs build() {
+ if ($.enabledFeatures == null) {
+ throw new MissingRequiredPropertyException("OrganizationsFeaturesArgs", "enabledFeatures");
+ }
+ return $;
+ }
+ }
+
+}
diff --git a/sdk/java/src/main/java/com/pulumi/aws/iam/inputs/OrganizationsFeaturesState.java b/sdk/java/src/main/java/com/pulumi/aws/iam/inputs/OrganizationsFeaturesState.java
new file mode 100644
index 00000000000..9c6b9091523
--- /dev/null
+++ b/sdk/java/src/main/java/com/pulumi/aws/iam/inputs/OrganizationsFeaturesState.java
@@ -0,0 +1,94 @@
+// *** WARNING: this file was generated by pulumi-java-gen. ***
+// *** Do not edit by hand unless you're certain you know what you are doing! ***
+
+package com.pulumi.aws.iam.inputs;
+
+import com.pulumi.core.Output;
+import com.pulumi.core.annotations.Import;
+import java.lang.String;
+import java.util.List;
+import java.util.Objects;
+import java.util.Optional;
+import javax.annotation.Nullable;
+
+
+public final class OrganizationsFeaturesState extends com.pulumi.resources.ResourceArgs {
+
+ public static final OrganizationsFeaturesState Empty = new OrganizationsFeaturesState();
+
+ /**
+ * List of IAM features to enable. Valid values are `RootCredentialsManagement` and `RootSessions`.
+ *
+ */
+ @Import(name="enabledFeatures")
+ private @Nullable Output> enabledFeatures;
+
+ /**
+ * @return List of IAM features to enable. Valid values are `RootCredentialsManagement` and `RootSessions`.
+ *
+ */
+ public Optional>> enabledFeatures() {
+ return Optional.ofNullable(this.enabledFeatures);
+ }
+
+ private OrganizationsFeaturesState() {}
+
+ private OrganizationsFeaturesState(OrganizationsFeaturesState $) {
+ this.enabledFeatures = $.enabledFeatures;
+ }
+
+ public static Builder builder() {
+ return new Builder();
+ }
+ public static Builder builder(OrganizationsFeaturesState defaults) {
+ return new Builder(defaults);
+ }
+
+ public static final class Builder {
+ private OrganizationsFeaturesState $;
+
+ public Builder() {
+ $ = new OrganizationsFeaturesState();
+ }
+
+ public Builder(OrganizationsFeaturesState defaults) {
+ $ = new OrganizationsFeaturesState(Objects.requireNonNull(defaults));
+ }
+
+ /**
+ * @param enabledFeatures List of IAM features to enable. Valid values are `RootCredentialsManagement` and `RootSessions`.
+ *
+ * @return builder
+ *
+ */
+ public Builder enabledFeatures(@Nullable Output> enabledFeatures) {
+ $.enabledFeatures = enabledFeatures;
+ return this;
+ }
+
+ /**
+ * @param enabledFeatures List of IAM features to enable. Valid values are `RootCredentialsManagement` and `RootSessions`.
+ *
+ * @return builder
+ *
+ */
+ public Builder enabledFeatures(List enabledFeatures) {
+ return enabledFeatures(Output.of(enabledFeatures));
+ }
+
+ /**
+ * @param enabledFeatures List of IAM features to enable. Valid values are `RootCredentialsManagement` and `RootSessions`.
+ *
+ * @return builder
+ *
+ */
+ public Builder enabledFeatures(String... enabledFeatures) {
+ return enabledFeatures(List.of(enabledFeatures));
+ }
+
+ public OrganizationsFeaturesState build() {
+ return $;
+ }
+ }
+
+}
diff --git a/sdk/java/src/main/java/com/pulumi/aws/lb/inputs/TargetGroupHealthCheckArgs.java b/sdk/java/src/main/java/com/pulumi/aws/lb/inputs/TargetGroupHealthCheckArgs.java
index 21922ba2915..026b8933681 100644
--- a/sdk/java/src/main/java/com/pulumi/aws/lb/inputs/TargetGroupHealthCheckArgs.java
+++ b/sdk/java/src/main/java/com/pulumi/aws/lb/inputs/TargetGroupHealthCheckArgs.java
@@ -92,7 +92,7 @@ public Optional> matcher() {
/**
* Destination for the health check request. Required for HTTP/HTTPS ALB and HTTP NLB. Only applies to HTTP/HTTPS.
* * For HTTP and HTTPS health checks, the default is `/`.
- * * For gRPC health checks, the default is `/Amazon Web Services.ALB/healthcheck`.
+ * * For gRPC health checks, the default is `/AWS.ALB/healthcheck`.
*
*/
@Import(name="path")
@@ -101,7 +101,7 @@ public Optional> matcher() {
/**
* @return Destination for the health check request. Required for HTTP/HTTPS ALB and HTTP NLB. Only applies to HTTP/HTTPS.
* * For HTTP and HTTPS health checks, the default is `/`.
- * * For gRPC health checks, the default is `/Amazon Web Services.ALB/healthcheck`.
+ * * For gRPC health checks, the default is `/AWS.ALB/healthcheck`.
*
*/
public Optional> path() {
@@ -311,7 +311,7 @@ public Builder matcher(String matcher) {
/**
* @param path Destination for the health check request. Required for HTTP/HTTPS ALB and HTTP NLB. Only applies to HTTP/HTTPS.
* * For HTTP and HTTPS health checks, the default is `/`.
- * * For gRPC health checks, the default is `/Amazon Web Services.ALB/healthcheck`.
+ * * For gRPC health checks, the default is `/AWS.ALB/healthcheck`.
*
* @return builder
*
@@ -324,7 +324,7 @@ public Builder path(@Nullable Output path) {
/**
* @param path Destination for the health check request. Required for HTTP/HTTPS ALB and HTTP NLB. Only applies to HTTP/HTTPS.
* * For HTTP and HTTPS health checks, the default is `/`.
- * * For gRPC health checks, the default is `/Amazon Web Services.ALB/healthcheck`.
+ * * For gRPC health checks, the default is `/AWS.ALB/healthcheck`.
*
* @return builder
*
diff --git a/sdk/java/src/main/java/com/pulumi/aws/lb/outputs/TargetGroupHealthCheck.java b/sdk/java/src/main/java/com/pulumi/aws/lb/outputs/TargetGroupHealthCheck.java
index af7b6dde253..d24604969ef 100644
--- a/sdk/java/src/main/java/com/pulumi/aws/lb/outputs/TargetGroupHealthCheck.java
+++ b/sdk/java/src/main/java/com/pulumi/aws/lb/outputs/TargetGroupHealthCheck.java
@@ -42,7 +42,7 @@ public final class TargetGroupHealthCheck {
/**
* @return Destination for the health check request. Required for HTTP/HTTPS ALB and HTTP NLB. Only applies to HTTP/HTTPS.
* * For HTTP and HTTPS health checks, the default is `/`.
- * * For gRPC health checks, the default is `/Amazon Web Services.ALB/healthcheck`.
+ * * For gRPC health checks, the default is `/AWS.ALB/healthcheck`.
*
*/
private @Nullable String path;
@@ -111,7 +111,7 @@ public Optional matcher() {
/**
* @return Destination for the health check request. Required for HTTP/HTTPS ALB and HTTP NLB. Only applies to HTTP/HTTPS.
* * For HTTP and HTTPS health checks, the default is `/`.
- * * For gRPC health checks, the default is `/Amazon Web Services.ALB/healthcheck`.
+ * * For gRPC health checks, the default is `/AWS.ALB/healthcheck`.
*
*/
public Optional path() {
diff --git a/sdk/java/src/main/java/com/pulumi/aws/memorydb/Cluster.java b/sdk/java/src/main/java/com/pulumi/aws/memorydb/Cluster.java
index e7ff78490f0..96daa5e9343 100644
--- a/sdk/java/src/main/java/com/pulumi/aws/memorydb/Cluster.java
+++ b/sdk/java/src/main/java/com/pulumi/aws/memorydb/Cluster.java
@@ -54,6 +54,8 @@
* .aclName("open-access")
* .name("my-cluster")
* .nodeType("db.t4g.small")
+ * .engine("redis")
+ * .engineVersion("7.1")
* .numShards(2)
* .securityGroupIds(exampleAwsSecurityGroup.id())
* .snapshotRetentionLimit(7)
@@ -154,28 +156,42 @@ public Output> description() {
return Codegen.optional(this.description);
}
/**
- * Patch version number of the Redis engine used by the cluster.
+ * The engine that will run on your nodes. Supported values are `redis` and `valkey`.
+ *
+ */
+ @Export(name="engine", refs={String.class}, tree="[0]")
+ private Output engine;
+
+ /**
+ * @return The engine that will run on your nodes. Supported values are `redis` and `valkey`.
+ *
+ */
+ public Output engine() {
+ return this.engine;
+ }
+ /**
+ * Patch version number of the engine used by the cluster.
*
*/
@Export(name="enginePatchVersion", refs={String.class}, tree="[0]")
private Output enginePatchVersion;
/**
- * @return Patch version number of the Redis engine used by the cluster.
+ * @return Patch version number of the engine used by the cluster.
*
*/
public Output enginePatchVersion() {
return this.enginePatchVersion;
}
/**
- * Version number of the Redis engine to be used for the cluster. Downgrades are not supported.
+ * Version number of the engine to be used for the cluster. Downgrades are not supported.
*
*/
@Export(name="engineVersion", refs={String.class}, tree="[0]")
private Output engineVersion;
/**
- * @return Version number of the Redis engine to be used for the cluster. Downgrades are not supported.
+ * @return Version number of the engine to be used for the cluster. Downgrades are not supported.
*
*/
public Output engineVersion() {
diff --git a/sdk/java/src/main/java/com/pulumi/aws/memorydb/ClusterArgs.java b/sdk/java/src/main/java/com/pulumi/aws/memorydb/ClusterArgs.java
index 2f48cc2ab22..d7ffd878744 100644
--- a/sdk/java/src/main/java/com/pulumi/aws/memorydb/ClusterArgs.java
+++ b/sdk/java/src/main/java/com/pulumi/aws/memorydb/ClusterArgs.java
@@ -81,14 +81,29 @@ public Optional> description() {
}
/**
- * Version number of the Redis engine to be used for the cluster. Downgrades are not supported.
+ * The engine that will run on your nodes. Supported values are `redis` and `valkey`.
+ *
+ */
+ @Import(name="engine")
+ private @Nullable Output engine;
+
+ /**
+ * @return The engine that will run on your nodes. Supported values are `redis` and `valkey`.
+ *
+ */
+ public Optional> engine() {
+ return Optional.ofNullable(this.engine);
+ }
+
+ /**
+ * Version number of the engine to be used for the cluster. Downgrades are not supported.
*
*/
@Import(name="engineVersion")
private @Nullable Output engineVersion;
/**
- * @return Version number of the Redis engine to be used for the cluster. Downgrades are not supported.
+ * @return Version number of the engine to be used for the cluster. Downgrades are not supported.
*
*/
public Optional> engineVersion() {
@@ -391,6 +406,7 @@ private ClusterArgs(ClusterArgs $) {
this.autoMinorVersionUpgrade = $.autoMinorVersionUpgrade;
this.dataTiering = $.dataTiering;
this.description = $.description;
+ this.engine = $.engine;
this.engineVersion = $.engineVersion;
this.finalSnapshotName = $.finalSnapshotName;
this.kmsKeyArn = $.kmsKeyArn;
@@ -516,7 +532,28 @@ public Builder description(String description) {
}
/**
- * @param engineVersion Version number of the Redis engine to be used for the cluster. Downgrades are not supported.
+ * @param engine The engine that will run on your nodes. Supported values are `redis` and `valkey`.
+ *
+ * @return builder
+ *
+ */
+ public Builder engine(@Nullable Output engine) {
+ $.engine = engine;
+ return this;
+ }
+
+ /**
+ * @param engine The engine that will run on your nodes. Supported values are `redis` and `valkey`.
+ *
+ * @return builder
+ *
+ */
+ public Builder engine(String engine) {
+ return engine(Output.of(engine));
+ }
+
+ /**
+ * @param engineVersion Version number of the engine to be used for the cluster. Downgrades are not supported.
*
* @return builder
*
@@ -527,7 +564,7 @@ public Builder engineVersion(@Nullable Output engineVersion) {
}
/**
- * @param engineVersion Version number of the Redis engine to be used for the cluster. Downgrades are not supported.
+ * @param engineVersion Version number of the engine to be used for the cluster. Downgrades are not supported.
*
* @return builder
*
diff --git a/sdk/java/src/main/java/com/pulumi/aws/memorydb/inputs/ClusterState.java b/sdk/java/src/main/java/com/pulumi/aws/memorydb/inputs/ClusterState.java
index e59b9490b28..fa4d63ba35a 100644
--- a/sdk/java/src/main/java/com/pulumi/aws/memorydb/inputs/ClusterState.java
+++ b/sdk/java/src/main/java/com/pulumi/aws/memorydb/inputs/ClusterState.java
@@ -104,14 +104,29 @@ public Optional> description() {
}
/**
- * Patch version number of the Redis engine used by the cluster.
+ * The engine that will run on your nodes. Supported values are `redis` and `valkey`.
+ *
+ */
+ @Import(name="engine")
+ private @Nullable Output engine;
+
+ /**
+ * @return The engine that will run on your nodes. Supported values are `redis` and `valkey`.
+ *
+ */
+ public Optional> engine() {
+ return Optional.ofNullable(this.engine);
+ }
+
+ /**
+ * Patch version number of the engine used by the cluster.
*
*/
@Import(name="enginePatchVersion")
private @Nullable Output enginePatchVersion;
/**
- * @return Patch version number of the Redis engine used by the cluster.
+ * @return Patch version number of the engine used by the cluster.
*
*/
public Optional> enginePatchVersion() {
@@ -119,14 +134,14 @@ public Optional> enginePatchVersion() {
}
/**
- * Version number of the Redis engine to be used for the cluster. Downgrades are not supported.
+ * Version number of the engine to be used for the cluster. Downgrades are not supported.
*
*/
@Import(name="engineVersion")
private @Nullable Output engineVersion;
/**
- * @return Version number of the Redis engine to be used for the cluster. Downgrades are not supported.
+ * @return Version number of the engine to be used for the cluster. Downgrades are not supported.
*
*/
public Optional> engineVersion() {
@@ -469,6 +484,7 @@ private ClusterState(ClusterState $) {
this.clusterEndpoints = $.clusterEndpoints;
this.dataTiering = $.dataTiering;
this.description = $.description;
+ this.engine = $.engine;
this.enginePatchVersion = $.enginePatchVersion;
this.engineVersion = $.engineVersion;
this.finalSnapshotName = $.finalSnapshotName;
@@ -631,7 +647,28 @@ public Builder description(String description) {
}
/**
- * @param enginePatchVersion Patch version number of the Redis engine used by the cluster.
+ * @param engine The engine that will run on your nodes. Supported values are `redis` and `valkey`.
+ *
+ * @return builder
+ *
+ */
+ public Builder engine(@Nullable Output engine) {
+ $.engine = engine;
+ return this;
+ }
+
+ /**
+ * @param engine The engine that will run on your nodes. Supported values are `redis` and `valkey`.
+ *
+ * @return builder
+ *
+ */
+ public Builder engine(String engine) {
+ return engine(Output.of(engine));
+ }
+
+ /**
+ * @param enginePatchVersion Patch version number of the engine used by the cluster.
*
* @return builder
*
@@ -642,7 +679,7 @@ public Builder enginePatchVersion(@Nullable Output enginePatchVersion) {
}
/**
- * @param enginePatchVersion Patch version number of the Redis engine used by the cluster.
+ * @param enginePatchVersion Patch version number of the engine used by the cluster.
*
* @return builder
*
@@ -652,7 +689,7 @@ public Builder enginePatchVersion(String enginePatchVersion) {
}
/**
- * @param engineVersion Version number of the Redis engine to be used for the cluster. Downgrades are not supported.
+ * @param engineVersion Version number of the engine to be used for the cluster. Downgrades are not supported.
*
* @return builder
*
@@ -663,7 +700,7 @@ public Builder engineVersion(@Nullable Output engineVersion) {
}
/**
- * @param engineVersion Version number of the Redis engine to be used for the cluster. Downgrades are not supported.
+ * @param engineVersion Version number of the engine to be used for the cluster. Downgrades are not supported.
*
* @return builder
*
diff --git a/sdk/java/src/main/java/com/pulumi/aws/memorydb/inputs/SnapshotClusterConfigurationArgs.java b/sdk/java/src/main/java/com/pulumi/aws/memorydb/inputs/SnapshotClusterConfigurationArgs.java
index c4ffa24cf08..9d5f09be87c 100644
--- a/sdk/java/src/main/java/com/pulumi/aws/memorydb/inputs/SnapshotClusterConfigurationArgs.java
+++ b/sdk/java/src/main/java/com/pulumi/aws/memorydb/inputs/SnapshotClusterConfigurationArgs.java
@@ -32,14 +32,29 @@ public Optional> description() {
}
/**
- * Version number of the Redis engine used by the cluster.
+ * The engine that will run on cluster nodes.
+ *
+ */
+ @Import(name="engine")
+ private @Nullable Output engine;
+
+ /**
+ * @return The engine that will run on cluster nodes.
+ *
+ */
+ public Optional> engine() {
+ return Optional.ofNullable(this.engine);
+ }
+
+ /**
+ * Version number of the engine used by the cluster.
*
*/
@Import(name="engineVersion")
private @Nullable Output engineVersion;
/**
- * @return Version number of the Redis engine used by the cluster.
+ * @return Version number of the engine used by the cluster.
*
*/
public Optional> engineVersion() {
@@ -215,6 +230,7 @@ private SnapshotClusterConfigurationArgs() {}
private SnapshotClusterConfigurationArgs(SnapshotClusterConfigurationArgs $) {
this.description = $.description;
+ this.engine = $.engine;
this.engineVersion = $.engineVersion;
this.maintenanceWindow = $.maintenanceWindow;
this.name = $.name;
@@ -269,7 +285,28 @@ public Builder description(String description) {
}
/**
- * @param engineVersion Version number of the Redis engine used by the cluster.
+ * @param engine The engine that will run on cluster nodes.
+ *
+ * @return builder
+ *
+ */
+ public Builder engine(@Nullable Output engine) {
+ $.engine = engine;
+ return this;
+ }
+
+ /**
+ * @param engine The engine that will run on cluster nodes.
+ *
+ * @return builder
+ *
+ */
+ public Builder engine(String engine) {
+ return engine(Output.of(engine));
+ }
+
+ /**
+ * @param engineVersion Version number of the engine used by the cluster.
*
* @return builder
*
@@ -280,7 +317,7 @@ public Builder engineVersion(@Nullable Output engineVersion) {
}
/**
- * @param engineVersion Version number of the Redis engine used by the cluster.
+ * @param engineVersion Version number of the engine used by the cluster.
*
* @return builder
*
diff --git a/sdk/java/src/main/java/com/pulumi/aws/memorydb/outputs/GetClusterResult.java b/sdk/java/src/main/java/com/pulumi/aws/memorydb/outputs/GetClusterResult.java
index aa1ea41a69d..bcfc3a51af8 100644
--- a/sdk/java/src/main/java/com/pulumi/aws/memorydb/outputs/GetClusterResult.java
+++ b/sdk/java/src/main/java/com/pulumi/aws/memorydb/outputs/GetClusterResult.java
@@ -43,12 +43,17 @@ public final class GetClusterResult {
*/
private String description;
/**
- * @return Patch version number of the Redis engine used by the cluster.
+ * @return Engine that will run on cluster nodes.
+ *
+ */
+ private String engine;
+ /**
+ * @return Patch version number of the engine used by the cluster.
*
*/
private String enginePatchVersion;
/**
- * @return Version number of the Redis engine used by the cluster.
+ * @return Version number of the engine used by the cluster.
*
*/
private String engineVersion;
@@ -183,14 +188,21 @@ public String description() {
return this.description;
}
/**
- * @return Patch version number of the Redis engine used by the cluster.
+ * @return Engine that will run on cluster nodes.
+ *
+ */
+ public String engine() {
+ return this.engine;
+ }
+ /**
+ * @return Patch version number of the engine used by the cluster.
*
*/
public String enginePatchVersion() {
return this.enginePatchVersion;
}
/**
- * @return Version number of the Redis engine used by the cluster.
+ * @return Version number of the engine used by the cluster.
*
*/
public String engineVersion() {
@@ -338,6 +350,7 @@ public static final class Builder {
private List clusterEndpoints;
private Boolean dataTiering;
private String description;
+ private String engine;
private String enginePatchVersion;
private String engineVersion;
private String finalSnapshotName;
@@ -367,6 +380,7 @@ public Builder(GetClusterResult defaults) {
this.clusterEndpoints = defaults.clusterEndpoints;
this.dataTiering = defaults.dataTiering;
this.description = defaults.description;
+ this.engine = defaults.engine;
this.enginePatchVersion = defaults.enginePatchVersion;
this.engineVersion = defaults.engineVersion;
this.finalSnapshotName = defaults.finalSnapshotName;
@@ -441,6 +455,14 @@ public Builder description(String description) {
return this;
}
@CustomType.Setter
+ public Builder engine(String engine) {
+ if (engine == null) {
+ throw new MissingRequiredPropertyException("GetClusterResult", "engine");
+ }
+ this.engine = engine;
+ return this;
+ }
+ @CustomType.Setter
public Builder enginePatchVersion(String enginePatchVersion) {
if (enginePatchVersion == null) {
throw new MissingRequiredPropertyException("GetClusterResult", "enginePatchVersion");
@@ -614,6 +636,7 @@ public GetClusterResult build() {
_resultValue.clusterEndpoints = clusterEndpoints;
_resultValue.dataTiering = dataTiering;
_resultValue.description = description;
+ _resultValue.engine = engine;
_resultValue.enginePatchVersion = enginePatchVersion;
_resultValue.engineVersion = engineVersion;
_resultValue.finalSnapshotName = finalSnapshotName;
diff --git a/sdk/java/src/main/java/com/pulumi/aws/memorydb/outputs/GetSnapshotClusterConfiguration.java b/sdk/java/src/main/java/com/pulumi/aws/memorydb/outputs/GetSnapshotClusterConfiguration.java
index d7a0431b63d..8a6a32da027 100644
--- a/sdk/java/src/main/java/com/pulumi/aws/memorydb/outputs/GetSnapshotClusterConfiguration.java
+++ b/sdk/java/src/main/java/com/pulumi/aws/memorydb/outputs/GetSnapshotClusterConfiguration.java
@@ -17,7 +17,12 @@ public final class GetSnapshotClusterConfiguration {
*/
private String description;
/**
- * @return Version number of the Redis engine used by the cluster.
+ * @return The engine that will run on cluster nodes.
+ *
+ */
+ private String engine;
+ /**
+ * @return Version number of the engine used by the cluster.
*
*/
private String engineVersion;
@@ -86,7 +91,14 @@ public String description() {
return this.description;
}
/**
- * @return Version number of the Redis engine used by the cluster.
+ * @return The engine that will run on cluster nodes.
+ *
+ */
+ public String engine() {
+ return this.engine;
+ }
+ /**
+ * @return Version number of the engine used by the cluster.
*
*/
public String engineVersion() {
@@ -180,6 +192,7 @@ public static Builder builder(GetSnapshotClusterConfiguration defaults) {
@CustomType.Builder
public static final class Builder {
private String description;
+ private String engine;
private String engineVersion;
private String maintenanceWindow;
private String name;
@@ -196,6 +209,7 @@ public Builder() {}
public Builder(GetSnapshotClusterConfiguration defaults) {
Objects.requireNonNull(defaults);
this.description = defaults.description;
+ this.engine = defaults.engine;
this.engineVersion = defaults.engineVersion;
this.maintenanceWindow = defaults.maintenanceWindow;
this.name = defaults.name;
@@ -219,6 +233,14 @@ public Builder description(String description) {
return this;
}
@CustomType.Setter
+ public Builder engine(String engine) {
+ if (engine == null) {
+ throw new MissingRequiredPropertyException("GetSnapshotClusterConfiguration", "engine");
+ }
+ this.engine = engine;
+ return this;
+ }
+ @CustomType.Setter
public Builder engineVersion(String engineVersion) {
if (engineVersion == null) {
throw new MissingRequiredPropertyException("GetSnapshotClusterConfiguration", "engineVersion");
@@ -317,6 +339,7 @@ public Builder vpcId(String vpcId) {
public GetSnapshotClusterConfiguration build() {
final var _resultValue = new GetSnapshotClusterConfiguration();
_resultValue.description = description;
+ _resultValue.engine = engine;
_resultValue.engineVersion = engineVersion;
_resultValue.maintenanceWindow = maintenanceWindow;
_resultValue.name = name;
diff --git a/sdk/java/src/main/java/com/pulumi/aws/memorydb/outputs/SnapshotClusterConfiguration.java b/sdk/java/src/main/java/com/pulumi/aws/memorydb/outputs/SnapshotClusterConfiguration.java
index 51a698759b4..93cf86c7ea3 100644
--- a/sdk/java/src/main/java/com/pulumi/aws/memorydb/outputs/SnapshotClusterConfiguration.java
+++ b/sdk/java/src/main/java/com/pulumi/aws/memorydb/outputs/SnapshotClusterConfiguration.java
@@ -18,7 +18,12 @@ public final class SnapshotClusterConfiguration {
*/
private @Nullable String description;
/**
- * @return Version number of the Redis engine used by the cluster.
+ * @return The engine that will run on cluster nodes.
+ *
+ */
+ private @Nullable String engine;
+ /**
+ * @return Version number of the engine used by the cluster.
*
*/
private @Nullable String engineVersion;
@@ -87,7 +92,14 @@ public Optional description() {
return Optional.ofNullable(this.description);
}
/**
- * @return Version number of the Redis engine used by the cluster.
+ * @return The engine that will run on cluster nodes.
+ *
+ */
+ public Optional engine() {
+ return Optional.ofNullable(this.engine);
+ }
+ /**
+ * @return Version number of the engine used by the cluster.
*
*/
public Optional engineVersion() {
@@ -181,6 +193,7 @@ public static Builder builder(SnapshotClusterConfiguration defaults) {
@CustomType.Builder
public static final class Builder {
private @Nullable String description;
+ private @Nullable String engine;
private @Nullable String engineVersion;
private @Nullable String maintenanceWindow;
private @Nullable String name;
@@ -197,6 +210,7 @@ public Builder() {}
public Builder(SnapshotClusterConfiguration defaults) {
Objects.requireNonNull(defaults);
this.description = defaults.description;
+ this.engine = defaults.engine;
this.engineVersion = defaults.engineVersion;
this.maintenanceWindow = defaults.maintenanceWindow;
this.name = defaults.name;
@@ -218,6 +232,12 @@ public Builder description(@Nullable String description) {
return this;
}
@CustomType.Setter
+ public Builder engine(@Nullable String engine) {
+
+ this.engine = engine;
+ return this;
+ }
+ @CustomType.Setter
public Builder engineVersion(@Nullable String engineVersion) {
this.engineVersion = engineVersion;
@@ -292,6 +312,7 @@ public Builder vpcId(@Nullable String vpcId) {
public SnapshotClusterConfiguration build() {
final var _resultValue = new SnapshotClusterConfiguration();
_resultValue.description = description;
+ _resultValue.engine = engine;
_resultValue.engineVersion = engineVersion;
_resultValue.maintenanceWindow = maintenanceWindow;
_resultValue.name = name;
diff --git a/sdk/java/src/main/java/com/pulumi/aws/s3/BucketLifecycleConfigurationV2.java b/sdk/java/src/main/java/com/pulumi/aws/s3/BucketLifecycleConfigurationV2.java
index 1140885b25e..54afae84393 100644
--- a/sdk/java/src/main/java/com/pulumi/aws/s3/BucketLifecycleConfigurationV2.java
+++ b/sdk/java/src/main/java/com/pulumi/aws/s3/BucketLifecycleConfigurationV2.java
@@ -27,14 +27,12 @@
*
* For more information see the Amazon S3 User Guide on [`Lifecycle Configuration Elements`](https://docs.aws.amazon.com/AmazonS3/latest/userguide/intro-lifecycle-rules.html).
*
- * > **NOTE:** S3 Buckets only support a single lifecycle configuration. Declaring multiple `aws.s3.BucketLifecycleConfigurationV2` resources to the same S3 Bucket will cause a perpetual difference in configuration.
+ * > S3 Buckets only support a single lifecycle configuration. Declaring multiple `aws.s3.BucketLifecycleConfigurationV2` resources to the same S3 Bucket will cause a perpetual difference in configuration.
*
- * > **NOTE:** Lifecycle configurations may take some time to fully propagate to all AWS S3 systems.
+ * > Lifecycle configurations may take some time to fully propagate to all AWS S3 systems.
* Running Pulumi operations shortly after creating a lifecycle configuration may result in changes that affect configuration idempotence.
* See the Amazon S3 User Guide on [setting lifecycle configuration on a bucket](https://docs.aws.amazon.com/AmazonS3/latest/userguide/how-to-set-lifecycle-configuration-intro.html).
*
- * > This resource cannot be used with S3 directory buckets.
- *
* ## Example Usage
*
* ### With neither a filter nor prefix specified
@@ -618,7 +616,7 @@
*
* If the owner (account ID) of the source bucket differs from the account used to configure the AWS Provider, import using the `bucket` and `expected_bucket_owner` separated by a comma (`,`):
*
- * __Using `pulumi import` to import__ S3 bucket lifecycle configuration using the `bucket` or using the `bucket` and `expected_bucket_owner` separated by a comma (`,`). For example:
+ * Using `pulumi import`, import an S3 bucket lifecycle configuration using the `bucket` or the `bucket` and `expected_bucket_owner` separated by a comma (`,`). For example:
*
* If the owner (account ID) of the source bucket is the same account used to configure the AWS Provider, import using the `bucket`:
*
diff --git a/sdk/nodejs/iam/index.ts b/sdk/nodejs/iam/index.ts
index c4ddf27968e..423b006e9d2 100644
--- a/sdk/nodejs/iam/index.ts
+++ b/sdk/nodejs/iam/index.ts
@@ -147,6 +147,11 @@ export type OpenIdConnectProvider = import("./openIdConnectProvider").OpenIdConn
export const OpenIdConnectProvider: typeof import("./openIdConnectProvider").OpenIdConnectProvider = null as any;
utilities.lazyLoad(exports, ["OpenIdConnectProvider"], () => require("./openIdConnectProvider"));
+export { OrganizationsFeaturesArgs, OrganizationsFeaturesState } from "./organizationsFeatures";
+export type OrganizationsFeatures = import("./organizationsFeatures").OrganizationsFeatures;
+export const OrganizationsFeatures: typeof import("./organizationsFeatures").OrganizationsFeatures = null as any;
+utilities.lazyLoad(exports, ["OrganizationsFeatures"], () => require("./organizationsFeatures"));
+
export { PolicyArgs, PolicyState } from "./policy";
export type Policy = import("./policy").Policy;
export const Policy: typeof import("./policy").Policy = null as any;
@@ -288,6 +293,8 @@ const _module = {
return new InstanceProfile(name, undefined, { urn })
case "aws:iam/openIdConnectProvider:OpenIdConnectProvider":
return new OpenIdConnectProvider(name, undefined, { urn })
+ case "aws:iam/organizationsFeatures:OrganizationsFeatures":
+ return new OrganizationsFeatures(name, undefined, { urn })
case "aws:iam/policy:Policy":
return new Policy(name, undefined, { urn })
case "aws:iam/policyAttachment:PolicyAttachment":
@@ -348,6 +355,7 @@ pulumi.runtime.registerResourceModule("aws", "iam/groupPolicyAttachment", _modul
pulumi.runtime.registerResourceModule("aws", "iam/groupPolicyAttachmentsExclusive", _module)
pulumi.runtime.registerResourceModule("aws", "iam/instanceProfile", _module)
pulumi.runtime.registerResourceModule("aws", "iam/openIdConnectProvider", _module)
+pulumi.runtime.registerResourceModule("aws", "iam/organizationsFeatures", _module)
pulumi.runtime.registerResourceModule("aws", "iam/policy", _module)
pulumi.runtime.registerResourceModule("aws", "iam/policyAttachment", _module)
pulumi.runtime.registerResourceModule("aws", "iam/role", _module)
diff --git a/sdk/nodejs/iam/organizationsFeatures.ts b/sdk/nodejs/iam/organizationsFeatures.ts
new file mode 100644
index 00000000000..486789f8f9b
--- /dev/null
+++ b/sdk/nodejs/iam/organizationsFeatures.ts
@@ -0,0 +1,113 @@
+// *** WARNING: this file was generated by the Pulumi Terraform Bridge (tfgen) Tool. ***
+// *** Do not edit by hand unless you're certain you know what you are doing! ***
+
+import * as pulumi from "@pulumi/pulumi";
+import * as utilities from "../utilities";
+
+/**
+ * Manages centralized root access features across AWS member accounts managed using AWS Organizations. More information about managing root access in IAM can be found in the [Centralize root access for member accounts](https://docs.aws.amazon.com/IAM/latest/UserGuide/id_root-enable-root-access.html).
+ *
+ * > **NOTE:** The AWS account utilizing this resource must be an Organizations management account. Also, you must enable trusted access for AWS Identity and Access Management in AWS Organizations.
+ *
+ * ## Example Usage
+ *
+ * ```typescript
+ * import * as pulumi from "@pulumi/pulumi";
+ * import * as aws from "@pulumi/aws";
+ *
+ * const example = new aws.organizations.Organization("example", {
+ * awsServiceAccessPrincipals: ["iam.amazonaws.com"],
+ * featureSet: "ALL",
+ * });
+ * const exampleOrganizationsFeatures = new aws.iam.OrganizationsFeatures("example", {enabledFeatures: [
+ * "RootCredentialsManagement",
+ * "RootSessions",
+ * ]});
+ * ```
+ *
+ * ## Import
+ *
+ * Using `pulumi import`, import root access features using the `id`. For example:
+ *
+ * ```sh
+ * $ pulumi import aws:iam/organizationsFeatures:OrganizationsFeatures example o-1234567
+ * ```
+ */
+export class OrganizationsFeatures extends pulumi.CustomResource {
+ /**
+ * Get an existing OrganizationsFeatures resource's state with the given name, ID, and optional extra
+ * properties used to qualify the lookup.
+ *
+ * @param name The _unique_ name of the resulting resource.
+ * @param id The _unique_ provider ID of the resource to lookup.
+ * @param state Any extra arguments used during the lookup.
+ * @param opts Optional settings to control the behavior of the CustomResource.
+ */
+ public static get(name: string, id: pulumi.Input, state?: OrganizationsFeaturesState, opts?: pulumi.CustomResourceOptions): OrganizationsFeatures {
+ return new OrganizationsFeatures(name, state, { ...opts, id: id });
+ }
+
+ /** @internal */
+ public static readonly __pulumiType = 'aws:iam/organizationsFeatures:OrganizationsFeatures';
+
+ /**
+ * Returns true if the given object is an instance of OrganizationsFeatures. This is designed to work even
+ * when multiple copies of the Pulumi SDK have been loaded into the same process.
+ */
+ public static isInstance(obj: any): obj is OrganizationsFeatures {
+ if (obj === undefined || obj === null) {
+ return false;
+ }
+ return obj['__pulumiType'] === OrganizationsFeatures.__pulumiType;
+ }
+
+ /**
+ * List of IAM features to enable. Valid values are `RootCredentialsManagement` and `RootSessions`.
+ */
+ public readonly enabledFeatures!: pulumi.Output;
+
+ /**
+ * Create a OrganizationsFeatures resource with the given unique name, arguments, and options.
+ *
+ * @param name The _unique_ name of the resource.
+ * @param args The arguments to use to populate this resource's properties.
+ * @param opts A bag of options that control this resource's behavior.
+ */
+ constructor(name: string, args: OrganizationsFeaturesArgs, opts?: pulumi.CustomResourceOptions)
+ constructor(name: string, argsOrState?: OrganizationsFeaturesArgs | OrganizationsFeaturesState, opts?: pulumi.CustomResourceOptions) {
+ let resourceInputs: pulumi.Inputs = {};
+ opts = opts || {};
+ if (opts.id) {
+ const state = argsOrState as OrganizationsFeaturesState | undefined;
+ resourceInputs["enabledFeatures"] = state ? state.enabledFeatures : undefined;
+ } else {
+ const args = argsOrState as OrganizationsFeaturesArgs | undefined;
+ if ((!args || args.enabledFeatures === undefined) && !opts.urn) {
+ throw new Error("Missing required property 'enabledFeatures'");
+ }
+ resourceInputs["enabledFeatures"] = args ? args.enabledFeatures : undefined;
+ }
+ opts = pulumi.mergeOptions(utilities.resourceOptsDefaults(), opts);
+ super(OrganizationsFeatures.__pulumiType, name, resourceInputs, opts);
+ }
+}
+
+/**
+ * Input properties used for looking up and filtering OrganizationsFeatures resources.
+ */
+export interface OrganizationsFeaturesState {
+ /**
+ * List of IAM features to enable. Valid values are `RootCredentialsManagement` and `RootSessions`.
+ */
+ enabledFeatures?: pulumi.Input[]>;
+}
+
+/**
+ * The set of arguments for constructing a OrganizationsFeatures resource.
+ */
+export interface OrganizationsFeaturesArgs {
+ /**
+ * List of IAM features to enable. Valid values are `RootCredentialsManagement` and `RootSessions`.
+ */
+ enabledFeatures: pulumi.Input[]>;
+}
diff --git a/sdk/nodejs/memorydb/cluster.ts b/sdk/nodejs/memorydb/cluster.ts
index 0bfef2e1761..e4f83d8c760 100644
--- a/sdk/nodejs/memorydb/cluster.ts
+++ b/sdk/nodejs/memorydb/cluster.ts
@@ -22,6 +22,8 @@ import * as utilities from "../utilities";
* aclName: "open-access",
* name: "my-cluster",
* nodeType: "db.t4g.small",
+ * engine: "redis",
+ * engineVersion: "7.1",
* numShards: 2,
* securityGroupIds: [exampleAwsSecurityGroup.id],
* snapshotRetentionLimit: 7,
@@ -87,11 +89,15 @@ export class Cluster extends pulumi.CustomResource {
*/
public readonly description!: pulumi.Output;
/**
- * Patch version number of the Redis engine used by the cluster.
+ * The engine that will run on your nodes. Supported values are `redis` and `valkey`.
+ */
+ public readonly engine!: pulumi.Output;
+ /**
+ * Patch version number of the engine used by the cluster.
*/
public /*out*/ readonly enginePatchVersion!: pulumi.Output;
/**
- * Version number of the Redis engine to be used for the cluster. Downgrades are not supported.
+ * Version number of the engine to be used for the cluster. Downgrades are not supported.
*/
public readonly engineVersion!: pulumi.Output;
/**
@@ -202,6 +208,7 @@ export class Cluster extends pulumi.CustomResource {
resourceInputs["clusterEndpoints"] = state ? state.clusterEndpoints : undefined;
resourceInputs["dataTiering"] = state ? state.dataTiering : undefined;
resourceInputs["description"] = state ? state.description : undefined;
+ resourceInputs["engine"] = state ? state.engine : undefined;
resourceInputs["enginePatchVersion"] = state ? state.enginePatchVersion : undefined;
resourceInputs["engineVersion"] = state ? state.engineVersion : undefined;
resourceInputs["finalSnapshotName"] = state ? state.finalSnapshotName : undefined;
@@ -237,6 +244,7 @@ export class Cluster extends pulumi.CustomResource {
resourceInputs["autoMinorVersionUpgrade"] = args ? args.autoMinorVersionUpgrade : undefined;
resourceInputs["dataTiering"] = args ? args.dataTiering : undefined;
resourceInputs["description"] = args ? args.description : undefined;
+ resourceInputs["engine"] = args ? args.engine : undefined;
resourceInputs["engineVersion"] = args ? args.engineVersion : undefined;
resourceInputs["finalSnapshotName"] = args ? args.finalSnapshotName : undefined;
resourceInputs["kmsKeyArn"] = args ? args.kmsKeyArn : undefined;
@@ -294,11 +302,15 @@ export interface ClusterState {
*/
description?: pulumi.Input;
/**
- * Patch version number of the Redis engine used by the cluster.
+ * The engine that will run on your nodes. Supported values are `redis` and `valkey`.
+ */
+ engine?: pulumi.Input;
+ /**
+ * Patch version number of the engine used by the cluster.
*/
enginePatchVersion?: pulumi.Input;
/**
- * Version number of the Redis engine to be used for the cluster. Downgrades are not supported.
+ * Version number of the engine to be used for the cluster. Downgrades are not supported.
*/
engineVersion?: pulumi.Input;
/**
@@ -412,7 +424,11 @@ export interface ClusterArgs {
*/
description?: pulumi.Input;
/**
- * Version number of the Redis engine to be used for the cluster. Downgrades are not supported.
+ * The engine that will run on your nodes. Supported values are `redis` and `valkey`.
+ */
+ engine?: pulumi.Input;
+ /**
+ * Version number of the engine to be used for the cluster. Downgrades are not supported.
*/
engineVersion?: pulumi.Input;
/**
diff --git a/sdk/nodejs/memorydb/getCluster.ts b/sdk/nodejs/memorydb/getCluster.ts
index aee8a24a7f9..0c24562eaf2 100644
--- a/sdk/nodejs/memorydb/getCluster.ts
+++ b/sdk/nodejs/memorydb/getCluster.ts
@@ -69,11 +69,15 @@ export interface GetClusterResult {
*/
readonly description: string;
/**
- * Patch version number of the Redis engine used by the cluster.
+ * Engine that will run on cluster nodes.
+ */
+ readonly engine: string;
+ /**
+ * Patch version number of the engine used by the cluster.
*/
readonly enginePatchVersion: string;
/**
- * Version number of the Redis engine used by the cluster.
+ * Version number of the engine used by the cluster.
*/
readonly engineVersion: string;
/**
diff --git a/sdk/nodejs/s3/bucketLifecycleConfigurationV2.ts b/sdk/nodejs/s3/bucketLifecycleConfigurationV2.ts
index 8fbfa0060dd..40ffecd7cf0 100644
--- a/sdk/nodejs/s3/bucketLifecycleConfigurationV2.ts
+++ b/sdk/nodejs/s3/bucketLifecycleConfigurationV2.ts
@@ -18,14 +18,12 @@ import * as utilities from "../utilities";
*
* For more information see the Amazon S3 User Guide on [`Lifecycle Configuration Elements`](https://docs.aws.amazon.com/AmazonS3/latest/userguide/intro-lifecycle-rules.html).
*
- * > **NOTE:** S3 Buckets only support a single lifecycle configuration. Declaring multiple `aws.s3.BucketLifecycleConfigurationV2` resources to the same S3 Bucket will cause a perpetual difference in configuration.
+ * > S3 Buckets only support a single lifecycle configuration. Declaring multiple `aws.s3.BucketLifecycleConfigurationV2` resources to the same S3 Bucket will cause a perpetual difference in configuration.
*
- * > **NOTE:** Lifecycle configurations may take some time to fully propagate to all AWS S3 systems.
+ * > Lifecycle configurations may take some time to fully propagate to all AWS S3 systems.
* Running Pulumi operations shortly after creating a lifecycle configuration may result in changes that affect configuration idempotence.
* See the Amazon S3 User Guide on [setting lifecycle configuration on a bucket](https://docs.aws.amazon.com/AmazonS3/latest/userguide/how-to-set-lifecycle-configuration-intro.html).
*
- * > This resource cannot be used with S3 directory buckets.
- *
* ## Example Usage
*
* ### With neither a filter nor prefix specified
@@ -329,7 +327,7 @@ import * as utilities from "../utilities";
*
* If the owner (account ID) of the source bucket differs from the account used to configure the AWS Provider, import using the `bucket` and `expected_bucket_owner` separated by a comma (`,`):
*
- * __Using `pulumi import` to import__ S3 bucket lifecycle configuration using the `bucket` or using the `bucket` and `expected_bucket_owner` separated by a comma (`,`). For example:
+ * Using `pulumi import`, import an S3 bucket lifecycle configuration using the `bucket` or the `bucket` and `expected_bucket_owner` separated by a comma (`,`). For example:
*
* If the owner (account ID) of the source bucket is the same account used to configure the AWS Provider, import using the `bucket`:
*
diff --git a/sdk/nodejs/tsconfig.json b/sdk/nodejs/tsconfig.json
index aeacd4752bb..228187505b2 100644
--- a/sdk/nodejs/tsconfig.json
+++ b/sdk/nodejs/tsconfig.json
@@ -1173,6 +1173,7 @@
"iam/instanceProfile.ts",
"iam/managedPolicies.ts",
"iam/openIdConnectProvider.ts",
+ "iam/organizationsFeatures.ts",
"iam/policy.ts",
"iam/policyAttachment.ts",
"iam/principals.ts",
diff --git a/sdk/nodejs/types/input.ts b/sdk/nodejs/types/input.ts
index 90b3df8010a..47519356600 100644
--- a/sdk/nodejs/types/input.ts
+++ b/sdk/nodejs/types/input.ts
@@ -2119,7 +2119,7 @@ export namespace alb {
/**
* Destination for the health check request. Required for HTTP/HTTPS ALB and HTTP NLB. Only applies to HTTP/HTTPS.
* * For HTTP and HTTPS health checks, the default is `/`.
- * * For gRPC health checks, the default is `/Amazon Web Services.ALB/healthcheck`.
+ * * For gRPC health checks, the default is `/AWS.ALB/healthcheck`.
*/
path?: pulumi.Input;
/**
@@ -10538,6 +10538,9 @@ export namespace bedrock {
* The intermediate storage for custom transformation.
*/
intermediateStorage?: pulumi.Input;
+ /**
+ * A custom processing step for documents moving through the data source ingestion pipeline.
+ */
transformation?: pulumi.Input;
}
@@ -10557,18 +10560,18 @@ export namespace bedrock {
export interface AgentDataSourceVectorIngestionConfigurationCustomTransformationConfigurationTransformation {
/**
- * Currently only `POST_CHUNKING` is supported.
+ * When the service applies the transformation. Currently only `POST_CHUNKING` is supported.
*/
stepToApply: pulumi.Input;
/**
- * The configuration of transformation function.
+ * The lambda function that processes documents.
*/
transformationFunction?: pulumi.Input;
}
export interface AgentDataSourceVectorIngestionConfigurationCustomTransformationConfigurationTransformationTransformationFunction {
/**
- * The lambda configuration for custom transformation.
+ * The configuration of the lambda function.
*/
transformationLambdaConfiguration?: pulumi.Input;
}
@@ -10947,7 +10950,8 @@ export namespace bedrock {
export interface GuardrailContentPolicyConfig {
/**
- * List of content filter configs in content policy. See Filters Config for more information.
+ * Set of content filter configs in content policy.
+ * See Filters Config for more information.
*/
filtersConfigs?: pulumi.Input[]>;
}
@@ -41284,7 +41288,7 @@ export namespace lb {
/**
* Destination for the health check request. Required for HTTP/HTTPS ALB and HTTP NLB. Only applies to HTTP/HTTPS.
* * For HTTP and HTTPS health checks, the default is `/`.
- * * For gRPC health checks, the default is `/Amazon Web Services.ALB/healthcheck`.
+ * * For gRPC health checks, the default is `/AWS.ALB/healthcheck`.
*/
path?: pulumi.Input;
/**
@@ -57592,7 +57596,11 @@ export namespace memorydb {
*/
description?: pulumi.Input;
/**
- * Version number of the Redis engine used by the cluster.
+ * The engine that will run on cluster nodes.
+ */
+ engine?: pulumi.Input;
+ /**
+ * Version number of the engine used by the cluster.
*/
engineVersion?: pulumi.Input;
/**
diff --git a/sdk/nodejs/types/output.ts b/sdk/nodejs/types/output.ts
index a56a56b0567..68d031cb0b9 100644
--- a/sdk/nodejs/types/output.ts
+++ b/sdk/nodejs/types/output.ts
@@ -991,7 +991,7 @@ export namespace alb {
/**
* Destination for the health check request. Required for HTTP/HTTPS ALB and HTTP NLB. Only applies to HTTP/HTTPS.
* * For HTTP and HTTPS health checks, the default is `/`.
- * * For gRPC health checks, the default is `/Amazon Web Services.ALB/healthcheck`.
+ * * For gRPC health checks, the default is `/AWS.ALB/healthcheck`.
*/
path: string;
/**
@@ -11829,6 +11829,9 @@ export namespace bedrock {
* The intermediate storage for custom transformation.
*/
intermediateStorage?: outputs.bedrock.AgentDataSourceVectorIngestionConfigurationCustomTransformationConfigurationIntermediateStorage;
+ /**
+ * A custom processing step for documents moving through the data source ingestion pipeline.
+ */
transformation?: outputs.bedrock.AgentDataSourceVectorIngestionConfigurationCustomTransformationConfigurationTransformation;
}
@@ -11848,18 +11851,18 @@ export namespace bedrock {
export interface AgentDataSourceVectorIngestionConfigurationCustomTransformationConfigurationTransformation {
/**
- * Currently only `POST_CHUNKING` is supported.
+ * When the service applies the transformation. Currently only `POST_CHUNKING` is supported.
*/
stepToApply: string;
/**
- * The configuration of transformation function.
+ * The lambda function that processes documents.
*/
transformationFunction?: outputs.bedrock.AgentDataSourceVectorIngestionConfigurationCustomTransformationConfigurationTransformationTransformationFunction;
}
export interface AgentDataSourceVectorIngestionConfigurationCustomTransformationConfigurationTransformationTransformationFunction {
/**
- * The lambda configuration for custom transformation.
+ * The configuration of the lambda function.
*/
transformationLambdaConfiguration?: outputs.bedrock.AgentDataSourceVectorIngestionConfigurationCustomTransformationConfigurationTransformationTransformationFunctionTransformationLambdaConfiguration;
}
@@ -12308,7 +12311,8 @@ export namespace bedrock {
export interface GuardrailContentPolicyConfig {
/**
- * List of content filter configs in content policy. See Filters Config for more information.
+ * Set of content filter configs in content policy.
+ * See Filters Config for more information.
*/
filtersConfigs?: outputs.bedrock.GuardrailContentPolicyConfigFiltersConfig[];
}
@@ -48341,7 +48345,7 @@ export namespace lb {
/**
* Destination for the health check request. Required for HTTP/HTTPS ALB and HTTP NLB. Only applies to HTTP/HTTPS.
* * For HTTP and HTTPS health checks, the default is `/`.
- * * For gRPC health checks, the default is `/Amazon Web Services.ALB/healthcheck`.
+ * * For gRPC health checks, the default is `/AWS.ALB/healthcheck`.
*/
path: string;
/**
@@ -64817,7 +64821,11 @@ export namespace memorydb {
*/
description: string;
/**
- * Version number of the Redis engine used by the cluster.
+ * The engine that will run on cluster nodes.
+ */
+ engine: string;
+ /**
+ * Version number of the engine used by the cluster.
*/
engineVersion: string;
/**
@@ -64894,7 +64902,11 @@ export namespace memorydb {
*/
description: string;
/**
- * Version number of the Redis engine used by the cluster.
+ * The engine that will run on cluster nodes.
+ */
+ engine: string;
+ /**
+ * Version number of the engine used by the cluster.
*/
engineVersion: string;
/**
diff --git a/sdk/python/pulumi_aws/__init__.py b/sdk/python/pulumi_aws/__init__.py
index 7466aa20cb7..48693fbbf5a 100644
--- a/sdk/python/pulumi_aws/__init__.py
+++ b/sdk/python/pulumi_aws/__init__.py
@@ -6434,6 +6434,14 @@
"aws:iam/openIdConnectProvider:OpenIdConnectProvider": "OpenIdConnectProvider"
}
},
+ {
+ "pkg": "aws",
+ "mod": "iam/organizationsFeatures",
+ "fqn": "pulumi_aws.iam",
+ "classes": {
+ "aws:iam/organizationsFeatures:OrganizationsFeatures": "OrganizationsFeatures"
+ }
+ },
{
"pkg": "aws",
"mod": "iam/policy",
diff --git a/sdk/python/pulumi_aws/alb/_inputs.py b/sdk/python/pulumi_aws/alb/_inputs.py
index 81a454688b0..057114494dc 100644
--- a/sdk/python/pulumi_aws/alb/_inputs.py
+++ b/sdk/python/pulumi_aws/alb/_inputs.py
@@ -2674,7 +2674,7 @@ class TargetGroupHealthCheckArgsDict(TypedDict):
"""
Destination for the health check request. Required for HTTP/HTTPS ALB and HTTP NLB. Only applies to HTTP/HTTPS.
* For HTTP and HTTPS health checks, the default is `/`.
- * For gRPC health checks, the default is `/Amazon Web Services.ALB/healthcheck`.
+ * For gRPC health checks, the default is `/AWS.ALB/healthcheck`.
"""
port: NotRequired[pulumi.Input[str]]
"""
@@ -2726,7 +2726,7 @@ def __init__(__self__, *,
* When the `target_type` is `lambda`, values can be between `200` and `499`. The default is `200`.
:param pulumi.Input[str] path: Destination for the health check request. Required for HTTP/HTTPS ALB and HTTP NLB. Only applies to HTTP/HTTPS.
* For HTTP and HTTPS health checks, the default is `/`.
- * For gRPC health checks, the default is `/Amazon Web Services.ALB/healthcheck`.
+ * For gRPC health checks, the default is `/AWS.ALB/healthcheck`.
:param pulumi.Input[str] port: The port the load balancer uses when performing health checks on targets.
Valid values are either `traffic-port`, to use the same port as the target group, or a valid port number between `1` and `65536`.
Default is `traffic-port`.
@@ -2817,7 +2817,7 @@ def path(self) -> Optional[pulumi.Input[str]]:
"""
Destination for the health check request. Required for HTTP/HTTPS ALB and HTTP NLB. Only applies to HTTP/HTTPS.
* For HTTP and HTTPS health checks, the default is `/`.
- * For gRPC health checks, the default is `/Amazon Web Services.ALB/healthcheck`.
+ * For gRPC health checks, the default is `/AWS.ALB/healthcheck`.
"""
return pulumi.get(self, "path")
diff --git a/sdk/python/pulumi_aws/alb/outputs.py b/sdk/python/pulumi_aws/alb/outputs.py
index c0e76d3b51f..58a5af6095d 100644
--- a/sdk/python/pulumi_aws/alb/outputs.py
+++ b/sdk/python/pulumi_aws/alb/outputs.py
@@ -1995,7 +1995,7 @@ def __init__(__self__, *,
* When the `target_type` is `lambda`, values can be between `200` and `499`. The default is `200`.
:param str path: Destination for the health check request. Required for HTTP/HTTPS ALB and HTTP NLB. Only applies to HTTP/HTTPS.
* For HTTP and HTTPS health checks, the default is `/`.
- * For gRPC health checks, the default is `/Amazon Web Services.ALB/healthcheck`.
+ * For gRPC health checks, the default is `/AWS.ALB/healthcheck`.
:param str port: The port the load balancer uses when performing health checks on targets.
Valid values are either `traffic-port`, to use the same port as the target group, or a valid port number between `1` and `65536`.
Default is `traffic-port`.
@@ -2070,7 +2070,7 @@ def path(self) -> Optional[str]:
"""
Destination for the health check request. Required for HTTP/HTTPS ALB and HTTP NLB. Only applies to HTTP/HTTPS.
* For HTTP and HTTPS health checks, the default is `/`.
- * For gRPC health checks, the default is `/Amazon Web Services.ALB/healthcheck`.
+ * For gRPC health checks, the default is `/AWS.ALB/healthcheck`.
"""
return pulumi.get(self, "path")
diff --git a/sdk/python/pulumi_aws/bedrock/_inputs.py b/sdk/python/pulumi_aws/bedrock/_inputs.py
index a9ec94351e7..4fb5f1eb90e 100644
--- a/sdk/python/pulumi_aws/bedrock/_inputs.py
+++ b/sdk/python/pulumi_aws/bedrock/_inputs.py
@@ -1778,6 +1778,9 @@ class AgentDataSourceVectorIngestionConfigurationCustomTransformationConfigurati
The intermediate storage for custom transformation.
"""
transformation: NotRequired[pulumi.Input['AgentDataSourceVectorIngestionConfigurationCustomTransformationConfigurationTransformationArgsDict']]
+ """
+ A custom processing step for documents moving through the data source ingestion pipeline.
+ """
elif False:
AgentDataSourceVectorIngestionConfigurationCustomTransformationConfigurationArgsDict: TypeAlias = Mapping[str, Any]
@@ -1788,6 +1791,7 @@ def __init__(__self__, *,
transformation: Optional[pulumi.Input['AgentDataSourceVectorIngestionConfigurationCustomTransformationConfigurationTransformationArgs']] = None):
"""
:param pulumi.Input['AgentDataSourceVectorIngestionConfigurationCustomTransformationConfigurationIntermediateStorageArgs'] intermediate_storage: The intermediate storage for custom transformation.
+ :param pulumi.Input['AgentDataSourceVectorIngestionConfigurationCustomTransformationConfigurationTransformationArgs'] transformation: A custom processing step for documents moving through the data source ingestion pipeline.
"""
if intermediate_storage is not None:
pulumi.set(__self__, "intermediate_storage", intermediate_storage)
@@ -1809,6 +1813,9 @@ def intermediate_storage(self, value: Optional[pulumi.Input['AgentDataSourceVect
@property
@pulumi.getter
def transformation(self) -> Optional[pulumi.Input['AgentDataSourceVectorIngestionConfigurationCustomTransformationConfigurationTransformationArgs']]:
+ """
+ A custom processing step for documents moving through the data source ingestion pipeline.
+ """
return pulumi.get(self, "transformation")
@transformation.setter
@@ -1883,11 +1890,11 @@ def uri(self, value: pulumi.Input[str]):
class AgentDataSourceVectorIngestionConfigurationCustomTransformationConfigurationTransformationArgsDict(TypedDict):
step_to_apply: pulumi.Input[str]
"""
- Currently only `POST_CHUNKING` is supported.
+ When the service applies the transformation. Currently only `POST_CHUNKING` is supported.
"""
transformation_function: NotRequired[pulumi.Input['AgentDataSourceVectorIngestionConfigurationCustomTransformationConfigurationTransformationTransformationFunctionArgsDict']]
"""
- The configuration of transformation function.
+ The lambda function that processes documents.
"""
elif False:
AgentDataSourceVectorIngestionConfigurationCustomTransformationConfigurationTransformationArgsDict: TypeAlias = Mapping[str, Any]
@@ -1898,8 +1905,8 @@ def __init__(__self__, *,
step_to_apply: pulumi.Input[str],
transformation_function: Optional[pulumi.Input['AgentDataSourceVectorIngestionConfigurationCustomTransformationConfigurationTransformationTransformationFunctionArgs']] = None):
"""
- :param pulumi.Input[str] step_to_apply: Currently only `POST_CHUNKING` is supported.
- :param pulumi.Input['AgentDataSourceVectorIngestionConfigurationCustomTransformationConfigurationTransformationTransformationFunctionArgs'] transformation_function: The configuration of transformation function.
+ :param pulumi.Input[str] step_to_apply: When the service applies the transformation. Currently only `POST_CHUNKING` is supported.
+ :param pulumi.Input['AgentDataSourceVectorIngestionConfigurationCustomTransformationConfigurationTransformationTransformationFunctionArgs'] transformation_function: The lambda function that processes documents.
"""
pulumi.set(__self__, "step_to_apply", step_to_apply)
if transformation_function is not None:
@@ -1909,7 +1916,7 @@ def __init__(__self__, *,
@pulumi.getter(name="stepToApply")
def step_to_apply(self) -> pulumi.Input[str]:
"""
- Currently only `POST_CHUNKING` is supported.
+ When the service applies the transformation. Currently only `POST_CHUNKING` is supported.
"""
return pulumi.get(self, "step_to_apply")
@@ -1921,7 +1928,7 @@ def step_to_apply(self, value: pulumi.Input[str]):
@pulumi.getter(name="transformationFunction")
def transformation_function(self) -> Optional[pulumi.Input['AgentDataSourceVectorIngestionConfigurationCustomTransformationConfigurationTransformationTransformationFunctionArgs']]:
"""
- The configuration of transformation function.
+ The lambda function that processes documents.
"""
return pulumi.get(self, "transformation_function")
@@ -1934,7 +1941,7 @@ def transformation_function(self, value: Optional[pulumi.Input['AgentDataSourceV
class AgentDataSourceVectorIngestionConfigurationCustomTransformationConfigurationTransformationTransformationFunctionArgsDict(TypedDict):
transformation_lambda_configuration: NotRequired[pulumi.Input['AgentDataSourceVectorIngestionConfigurationCustomTransformationConfigurationTransformationTransformationFunctionTransformationLambdaConfigurationArgsDict']]
"""
- The lambda configuration for custom transformation.
+ The configuration of the lambda function.
"""
elif False:
AgentDataSourceVectorIngestionConfigurationCustomTransformationConfigurationTransformationTransformationFunctionArgsDict: TypeAlias = Mapping[str, Any]
@@ -1944,7 +1951,7 @@ class AgentDataSourceVectorIngestionConfigurationCustomTransformationConfigurati
def __init__(__self__, *,
transformation_lambda_configuration: Optional[pulumi.Input['AgentDataSourceVectorIngestionConfigurationCustomTransformationConfigurationTransformationTransformationFunctionTransformationLambdaConfigurationArgs']] = None):
"""
- :param pulumi.Input['AgentDataSourceVectorIngestionConfigurationCustomTransformationConfigurationTransformationTransformationFunctionTransformationLambdaConfigurationArgs'] transformation_lambda_configuration: The lambda configuration for custom transformation.
+ :param pulumi.Input['AgentDataSourceVectorIngestionConfigurationCustomTransformationConfigurationTransformationTransformationFunctionTransformationLambdaConfigurationArgs'] transformation_lambda_configuration: The configuration of the lambda function.
"""
if transformation_lambda_configuration is not None:
pulumi.set(__self__, "transformation_lambda_configuration", transformation_lambda_configuration)
@@ -1953,7 +1960,7 @@ def __init__(__self__, *,
@pulumi.getter(name="transformationLambdaConfiguration")
def transformation_lambda_configuration(self) -> Optional[pulumi.Input['AgentDataSourceVectorIngestionConfigurationCustomTransformationConfigurationTransformationTransformationFunctionTransformationLambdaConfigurationArgs']]:
"""
- The lambda configuration for custom transformation.
+ The configuration of the lambda function.
"""
return pulumi.get(self, "transformation_lambda_configuration")
@@ -3325,7 +3332,8 @@ def subnet_ids(self, value: pulumi.Input[Sequence[pulumi.Input[str]]]):
class GuardrailContentPolicyConfigArgsDict(TypedDict):
filters_configs: NotRequired[pulumi.Input[Sequence[pulumi.Input['GuardrailContentPolicyConfigFiltersConfigArgsDict']]]]
"""
- List of content filter configs in content policy. See Filters Config for more information.
+ Set of content filter configs in content policy.
+ See Filters Config for more information.
"""
elif False:
GuardrailContentPolicyConfigArgsDict: TypeAlias = Mapping[str, Any]
@@ -3335,7 +3343,8 @@ class GuardrailContentPolicyConfigArgs:
def __init__(__self__, *,
filters_configs: Optional[pulumi.Input[Sequence[pulumi.Input['GuardrailContentPolicyConfigFiltersConfigArgs']]]] = None):
"""
- :param pulumi.Input[Sequence[pulumi.Input['GuardrailContentPolicyConfigFiltersConfigArgs']]] filters_configs: List of content filter configs in content policy. See Filters Config for more information.
+ :param pulumi.Input[Sequence[pulumi.Input['GuardrailContentPolicyConfigFiltersConfigArgs']]] filters_configs: Set of content filter configs in content policy.
+ See Filters Config for more information.
"""
if filters_configs is not None:
pulumi.set(__self__, "filters_configs", filters_configs)
@@ -3344,7 +3353,8 @@ def __init__(__self__, *,
@pulumi.getter(name="filtersConfigs")
def filters_configs(self) -> Optional[pulumi.Input[Sequence[pulumi.Input['GuardrailContentPolicyConfigFiltersConfigArgs']]]]:
"""
- List of content filter configs in content policy. See Filters Config for more information.
+ Set of content filter configs in content policy.
+ See Filters Config for more information.
"""
return pulumi.get(self, "filters_configs")
diff --git a/sdk/python/pulumi_aws/bedrock/outputs.py b/sdk/python/pulumi_aws/bedrock/outputs.py
index 7e3010bcbf2..4a54fb5ad4a 100644
--- a/sdk/python/pulumi_aws/bedrock/outputs.py
+++ b/sdk/python/pulumi_aws/bedrock/outputs.py
@@ -1427,6 +1427,7 @@ def __init__(__self__, *,
transformation: Optional['outputs.AgentDataSourceVectorIngestionConfigurationCustomTransformationConfigurationTransformation'] = None):
"""
:param 'AgentDataSourceVectorIngestionConfigurationCustomTransformationConfigurationIntermediateStorageArgs' intermediate_storage: The intermediate storage for custom transformation.
+ :param 'AgentDataSourceVectorIngestionConfigurationCustomTransformationConfigurationTransformationArgs' transformation: A custom processing step for documents moving through the data source ingestion pipeline.
"""
if intermediate_storage is not None:
pulumi.set(__self__, "intermediate_storage", intermediate_storage)
@@ -1444,6 +1445,9 @@ def intermediate_storage(self) -> Optional['outputs.AgentDataSourceVectorIngesti
@property
@pulumi.getter
def transformation(self) -> Optional['outputs.AgentDataSourceVectorIngestionConfigurationCustomTransformationConfigurationTransformation']:
+ """
+ A custom processing step for documents moving through the data source ingestion pipeline.
+ """
return pulumi.get(self, "transformation")
@@ -1526,8 +1530,8 @@ def __init__(__self__, *,
step_to_apply: str,
transformation_function: Optional['outputs.AgentDataSourceVectorIngestionConfigurationCustomTransformationConfigurationTransformationTransformationFunction'] = None):
"""
- :param str step_to_apply: Currently only `POST_CHUNKING` is supported.
- :param 'AgentDataSourceVectorIngestionConfigurationCustomTransformationConfigurationTransformationTransformationFunctionArgs' transformation_function: The configuration of transformation function.
+ :param str step_to_apply: When the service applies the transformation. Currently only `POST_CHUNKING` is supported.
+ :param 'AgentDataSourceVectorIngestionConfigurationCustomTransformationConfigurationTransformationTransformationFunctionArgs' transformation_function: The lambda function that processes documents.
"""
pulumi.set(__self__, "step_to_apply", step_to_apply)
if transformation_function is not None:
@@ -1537,7 +1541,7 @@ def __init__(__self__, *,
@pulumi.getter(name="stepToApply")
def step_to_apply(self) -> str:
"""
- Currently only `POST_CHUNKING` is supported.
+ When the service applies the transformation. Currently only `POST_CHUNKING` is supported.
"""
return pulumi.get(self, "step_to_apply")
@@ -1545,7 +1549,7 @@ def step_to_apply(self) -> str:
@pulumi.getter(name="transformationFunction")
def transformation_function(self) -> Optional['outputs.AgentDataSourceVectorIngestionConfigurationCustomTransformationConfigurationTransformationTransformationFunction']:
"""
- The configuration of transformation function.
+ The lambda function that processes documents.
"""
return pulumi.get(self, "transformation_function")
@@ -1572,7 +1576,7 @@ def get(self, key: str, default = None) -> Any:
def __init__(__self__, *,
transformation_lambda_configuration: Optional['outputs.AgentDataSourceVectorIngestionConfigurationCustomTransformationConfigurationTransformationTransformationFunctionTransformationLambdaConfiguration'] = None):
"""
- :param 'AgentDataSourceVectorIngestionConfigurationCustomTransformationConfigurationTransformationTransformationFunctionTransformationLambdaConfigurationArgs' transformation_lambda_configuration: The lambda configuration for custom transformation.
+ :param 'AgentDataSourceVectorIngestionConfigurationCustomTransformationConfigurationTransformationTransformationFunctionTransformationLambdaConfigurationArgs' transformation_lambda_configuration: The configuration of the lambda function.
"""
if transformation_lambda_configuration is not None:
pulumi.set(__self__, "transformation_lambda_configuration", transformation_lambda_configuration)
@@ -1581,7 +1585,7 @@ def __init__(__self__, *,
@pulumi.getter(name="transformationLambdaConfiguration")
def transformation_lambda_configuration(self) -> Optional['outputs.AgentDataSourceVectorIngestionConfigurationCustomTransformationConfigurationTransformationTransformationFunctionTransformationLambdaConfiguration']:
"""
- The lambda configuration for custom transformation.
+ The configuration of the lambda function.
"""
return pulumi.get(self, "transformation_lambda_configuration")
@@ -2812,7 +2816,8 @@ def get(self, key: str, default = None) -> Any:
def __init__(__self__, *,
filters_configs: Optional[Sequence['outputs.GuardrailContentPolicyConfigFiltersConfig']] = None):
"""
- :param Sequence['GuardrailContentPolicyConfigFiltersConfigArgs'] filters_configs: List of content filter configs in content policy. See Filters Config for more information.
+ :param Sequence['GuardrailContentPolicyConfigFiltersConfigArgs'] filters_configs: Set of content filter configs in content policy.
+ See Filters Config for more information.
"""
if filters_configs is not None:
pulumi.set(__self__, "filters_configs", filters_configs)
@@ -2821,7 +2826,8 @@ def __init__(__self__, *,
@pulumi.getter(name="filtersConfigs")
def filters_configs(self) -> Optional[Sequence['outputs.GuardrailContentPolicyConfigFiltersConfig']]:
"""
- List of content filter configs in content policy. See Filters Config for more information.
+ Set of content filter configs in content policy.
+ See Filters Config for more information.
"""
return pulumi.get(self, "filters_configs")
diff --git a/sdk/python/pulumi_aws/iam/__init__.py b/sdk/python/pulumi_aws/iam/__init__.py
index 232a828a307..7c6a3b92375 100644
--- a/sdk/python/pulumi_aws/iam/__init__.py
+++ b/sdk/python/pulumi_aws/iam/__init__.py
@@ -34,6 +34,7 @@
from .group_policy_attachments_exclusive import *
from .instance_profile import *
from .open_id_connect_provider import *
+from .organizations_features import *
from .policy import *
from .policy_attachment import *
from .role import *
diff --git a/sdk/python/pulumi_aws/iam/organizations_features.py b/sdk/python/pulumi_aws/iam/organizations_features.py
new file mode 100644
index 00000000000..2c7b80c46e4
--- /dev/null
+++ b/sdk/python/pulumi_aws/iam/organizations_features.py
@@ -0,0 +1,201 @@
+# coding=utf-8
+# *** WARNING: this file was generated by the Pulumi Terraform Bridge (tfgen) Tool. ***
+# *** Do not edit by hand unless you're certain you know what you are doing! ***
+
+import copy
+import warnings
+import sys
+import pulumi
+import pulumi.runtime
+from typing import Any, Mapping, Optional, Sequence, Union, overload
+if sys.version_info >= (3, 11):
+ from typing import NotRequired, TypedDict, TypeAlias
+else:
+ from typing_extensions import NotRequired, TypedDict, TypeAlias
+from .. import _utilities
+
+__all__ = ['OrganizationsFeaturesArgs', 'OrganizationsFeatures']
+
+@pulumi.input_type
+class OrganizationsFeaturesArgs:
+ def __init__(__self__, *,
+ enabled_features: pulumi.Input[Sequence[pulumi.Input[str]]]):
+ """
+ The set of arguments for constructing a OrganizationsFeatures resource.
+ :param pulumi.Input[Sequence[pulumi.Input[str]]] enabled_features: List of IAM features to enable. Valid values are `RootCredentialsManagement` and `RootSessions`.
+ """
+ pulumi.set(__self__, "enabled_features", enabled_features)
+
+ @property
+ @pulumi.getter(name="enabledFeatures")
+ def enabled_features(self) -> pulumi.Input[Sequence[pulumi.Input[str]]]:
+ """
+ List of IAM features to enable. Valid values are `RootCredentialsManagement` and `RootSessions`.
+ """
+ return pulumi.get(self, "enabled_features")
+
+ @enabled_features.setter
+ def enabled_features(self, value: pulumi.Input[Sequence[pulumi.Input[str]]]):
+ pulumi.set(self, "enabled_features", value)
+
+
+@pulumi.input_type
+class _OrganizationsFeaturesState:
+ def __init__(__self__, *,
+ enabled_features: Optional[pulumi.Input[Sequence[pulumi.Input[str]]]] = None):
+ """
+ Input properties used for looking up and filtering OrganizationsFeatures resources.
+ :param pulumi.Input[Sequence[pulumi.Input[str]]] enabled_features: List of IAM features to enable. Valid values are `RootCredentialsManagement` and `RootSessions`.
+ """
+ if enabled_features is not None:
+ pulumi.set(__self__, "enabled_features", enabled_features)
+
+ @property
+ @pulumi.getter(name="enabledFeatures")
+ def enabled_features(self) -> Optional[pulumi.Input[Sequence[pulumi.Input[str]]]]:
+ """
+ List of IAM features to enable. Valid values are `RootCredentialsManagement` and `RootSessions`.
+ """
+ return pulumi.get(self, "enabled_features")
+
+ @enabled_features.setter
+ def enabled_features(self, value: Optional[pulumi.Input[Sequence[pulumi.Input[str]]]]):
+ pulumi.set(self, "enabled_features", value)
+
+
+class OrganizationsFeatures(pulumi.CustomResource):
+ @overload
+ def __init__(__self__,
+ resource_name: str,
+ opts: Optional[pulumi.ResourceOptions] = None,
+ enabled_features: Optional[pulumi.Input[Sequence[pulumi.Input[str]]]] = None,
+ __props__=None):
+ """
+ Manages centralized root access features across AWS member accounts managed using AWS Organizations. More information about managing root access in IAM can be found in the [Centralize root access for member accounts](https://docs.aws.amazon.com/IAM/latest/UserGuide/id_root-enable-root-access.html).
+
+ > **NOTE:** The AWS account utilizing this resource must be an Organizations management account. Also, you must enable trusted access for AWS Identity and Access Management in AWS Organizations.
+
+ ## Example Usage
+
+ ```python
+ import pulumi
+ import pulumi_aws as aws
+
+ example = aws.organizations.Organization("example",
+ aws_service_access_principals=["iam.amazonaws.com"],
+ feature_set="ALL")
+ example_organizations_features = aws.iam.OrganizationsFeatures("example", enabled_features=[
+ "RootCredentialsManagement",
+ "RootSessions",
+ ])
+ ```
+
+ ## Import
+
+ Using `pulumi import`, import root access features using the `id`. For example:
+
+ ```sh
+ $ pulumi import aws:iam/organizationsFeatures:OrganizationsFeatures example o-1234567
+ ```
+
+ :param str resource_name: The name of the resource.
+ :param pulumi.ResourceOptions opts: Options for the resource.
+ :param pulumi.Input[Sequence[pulumi.Input[str]]] enabled_features: List of IAM features to enable. Valid values are `RootCredentialsManagement` and `RootSessions`.
+ """
+ ...
+ @overload
+ def __init__(__self__,
+ resource_name: str,
+ args: OrganizationsFeaturesArgs,
+ opts: Optional[pulumi.ResourceOptions] = None):
+ """
+ Manages centralized root access features across AWS member accounts managed using AWS Organizations. More information about managing root access in IAM can be found in the [Centralize root access for member accounts](https://docs.aws.amazon.com/IAM/latest/UserGuide/id_root-enable-root-access.html).
+
+ > **NOTE:** The AWS account utilizing this resource must be an Organizations management account. Also, you must enable trusted access for AWS Identity and Access Management in AWS Organizations.
+
+ ## Example Usage
+
+ ```python
+ import pulumi
+ import pulumi_aws as aws
+
+ example = aws.organizations.Organization("example",
+ aws_service_access_principals=["iam.amazonaws.com"],
+ feature_set="ALL")
+ example_organizations_features = aws.iam.OrganizationsFeatures("example", enabled_features=[
+ "RootCredentialsManagement",
+ "RootSessions",
+ ])
+ ```
+
+ ## Import
+
+ Using `pulumi import`, import root access features using the `id`. For example:
+
+ ```sh
+ $ pulumi import aws:iam/organizationsFeatures:OrganizationsFeatures example o-1234567
+ ```
+
+ :param str resource_name: The name of the resource.
+ :param OrganizationsFeaturesArgs args: The arguments to use to populate this resource's properties.
+ :param pulumi.ResourceOptions opts: Options for the resource.
+ """
+ ...
+ def __init__(__self__, resource_name: str, *args, **kwargs):
+ resource_args, opts = _utilities.get_resource_args_opts(OrganizationsFeaturesArgs, pulumi.ResourceOptions, *args, **kwargs)
+ if resource_args is not None:
+ __self__._internal_init(resource_name, opts, **resource_args.__dict__)
+ else:
+ __self__._internal_init(resource_name, *args, **kwargs)
+
+ def _internal_init(__self__,
+ resource_name: str,
+ opts: Optional[pulumi.ResourceOptions] = None,
+ enabled_features: Optional[pulumi.Input[Sequence[pulumi.Input[str]]]] = None,
+ __props__=None):
+ opts = pulumi.ResourceOptions.merge(_utilities.get_resource_opts_defaults(), opts)
+ if not isinstance(opts, pulumi.ResourceOptions):
+ raise TypeError('Expected resource options to be a ResourceOptions instance')
+ if opts.id is None:
+ if __props__ is not None:
+ raise TypeError('__props__ is only valid when passed in combination with a valid opts.id to get an existing resource')
+ __props__ = OrganizationsFeaturesArgs.__new__(OrganizationsFeaturesArgs)
+
+ if enabled_features is None and not opts.urn:
+ raise TypeError("Missing required property 'enabled_features'")
+ __props__.__dict__["enabled_features"] = enabled_features
+ super(OrganizationsFeatures, __self__).__init__(
+ 'aws:iam/organizationsFeatures:OrganizationsFeatures',
+ resource_name,
+ __props__,
+ opts)
+
+ @staticmethod
+ def get(resource_name: str,
+ id: pulumi.Input[str],
+ opts: Optional[pulumi.ResourceOptions] = None,
+ enabled_features: Optional[pulumi.Input[Sequence[pulumi.Input[str]]]] = None) -> 'OrganizationsFeatures':
+ """
+ Get an existing OrganizationsFeatures resource's state with the given name, id, and optional extra
+ properties used to qualify the lookup.
+
+ :param str resource_name: The unique name of the resulting resource.
+ :param pulumi.Input[str] id: The unique provider ID of the resource to lookup.
+ :param pulumi.ResourceOptions opts: Options for the resource.
+ :param pulumi.Input[Sequence[pulumi.Input[str]]] enabled_features: List of IAM features to enable. Valid values are `RootCredentialsManagement` and `RootSessions`.
+ """
+ opts = pulumi.ResourceOptions.merge(opts, pulumi.ResourceOptions(id=id))
+
+ __props__ = _OrganizationsFeaturesState.__new__(_OrganizationsFeaturesState)
+
+ __props__.__dict__["enabled_features"] = enabled_features
+ return OrganizationsFeatures(resource_name, opts=opts, __props__=__props__)
+
+ @property
+ @pulumi.getter(name="enabledFeatures")
+ def enabled_features(self) -> pulumi.Output[Sequence[str]]:
+ """
+ List of IAM features to enable. Valid values are `RootCredentialsManagement` and `RootSessions`.
+ """
+ return pulumi.get(self, "enabled_features")
+
diff --git a/sdk/python/pulumi_aws/lb/_inputs.py b/sdk/python/pulumi_aws/lb/_inputs.py
index aa645c9d6c4..ea1bf62f77f 100644
--- a/sdk/python/pulumi_aws/lb/_inputs.py
+++ b/sdk/python/pulumi_aws/lb/_inputs.py
@@ -2705,7 +2705,7 @@ class TargetGroupHealthCheckArgsDict(TypedDict):
"""
Destination for the health check request. Required for HTTP/HTTPS ALB and HTTP NLB. Only applies to HTTP/HTTPS.
* For HTTP and HTTPS health checks, the default is `/`.
- * For gRPC health checks, the default is `/Amazon Web Services.ALB/healthcheck`.
+ * For gRPC health checks, the default is `/AWS.ALB/healthcheck`.
"""
port: NotRequired[pulumi.Input[str]]
"""
@@ -2757,7 +2757,7 @@ def __init__(__self__, *,
* When the `target_type` is `lambda`, values can be between `200` and `499`. The default is `200`.
:param pulumi.Input[str] path: Destination for the health check request. Required for HTTP/HTTPS ALB and HTTP NLB. Only applies to HTTP/HTTPS.
* For HTTP and HTTPS health checks, the default is `/`.
- * For gRPC health checks, the default is `/Amazon Web Services.ALB/healthcheck`.
+ * For gRPC health checks, the default is `/AWS.ALB/healthcheck`.
:param pulumi.Input[str] port: The port the load balancer uses when performing health checks on targets.
Valid values are either `traffic-port`, to use the same port as the target group, or a valid port number between `1` and `65536`.
Default is `traffic-port`.
@@ -2848,7 +2848,7 @@ def path(self) -> Optional[pulumi.Input[str]]:
"""
Destination for the health check request. Required for HTTP/HTTPS ALB and HTTP NLB. Only applies to HTTP/HTTPS.
* For HTTP and HTTPS health checks, the default is `/`.
- * For gRPC health checks, the default is `/Amazon Web Services.ALB/healthcheck`.
+ * For gRPC health checks, the default is `/AWS.ALB/healthcheck`.
"""
return pulumi.get(self, "path")
diff --git a/sdk/python/pulumi_aws/lb/outputs.py b/sdk/python/pulumi_aws/lb/outputs.py
index 459887b8971..9f6adebc3f8 100644
--- a/sdk/python/pulumi_aws/lb/outputs.py
+++ b/sdk/python/pulumi_aws/lb/outputs.py
@@ -2010,7 +2010,7 @@ def __init__(__self__, *,
* When the `target_type` is `lambda`, values can be between `200` and `499`. The default is `200`.
:param str path: Destination for the health check request. Required for HTTP/HTTPS ALB and HTTP NLB. Only applies to HTTP/HTTPS.
* For HTTP and HTTPS health checks, the default is `/`.
- * For gRPC health checks, the default is `/Amazon Web Services.ALB/healthcheck`.
+ * For gRPC health checks, the default is `/AWS.ALB/healthcheck`.
:param str port: The port the load balancer uses when performing health checks on targets.
Valid values are either `traffic-port`, to use the same port as the target group, or a valid port number between `1` and `65536`.
Default is `traffic-port`.
@@ -2085,7 +2085,7 @@ def path(self) -> Optional[str]:
"""
Destination for the health check request. Required for HTTP/HTTPS ALB and HTTP NLB. Only applies to HTTP/HTTPS.
* For HTTP and HTTPS health checks, the default is `/`.
- * For gRPC health checks, the default is `/Amazon Web Services.ALB/healthcheck`.
+ * For gRPC health checks, the default is `/AWS.ALB/healthcheck`.
"""
return pulumi.get(self, "path")
diff --git a/sdk/python/pulumi_aws/memorydb/_inputs.py b/sdk/python/pulumi_aws/memorydb/_inputs.py
index 6a18dd9141e..5de829d7ee9 100644
--- a/sdk/python/pulumi_aws/memorydb/_inputs.py
+++ b/sdk/python/pulumi_aws/memorydb/_inputs.py
@@ -370,9 +370,13 @@ class SnapshotClusterConfigurationArgsDict(TypedDict):
"""
Description for the cluster.
"""
+ engine: NotRequired[pulumi.Input[str]]
+ """
+ The engine that will run on cluster nodes.
+ """
engine_version: NotRequired[pulumi.Input[str]]
"""
- Version number of the Redis engine used by the cluster.
+ Version number of the engine used by the cluster.
"""
maintenance_window: NotRequired[pulumi.Input[str]]
"""
@@ -425,6 +429,7 @@ class SnapshotClusterConfigurationArgsDict(TypedDict):
class SnapshotClusterConfigurationArgs:
def __init__(__self__, *,
description: Optional[pulumi.Input[str]] = None,
+ engine: Optional[pulumi.Input[str]] = None,
engine_version: Optional[pulumi.Input[str]] = None,
maintenance_window: Optional[pulumi.Input[str]] = None,
name: Optional[pulumi.Input[str]] = None,
@@ -439,7 +444,8 @@ def __init__(__self__, *,
vpc_id: Optional[pulumi.Input[str]] = None):
"""
:param pulumi.Input[str] description: Description for the cluster.
- :param pulumi.Input[str] engine_version: Version number of the Redis engine used by the cluster.
+ :param pulumi.Input[str] engine: The engine that will run on cluster nodes.
+ :param pulumi.Input[str] engine_version: Version number of the engine used by the cluster.
:param pulumi.Input[str] maintenance_window: The weekly time range during which maintenance on the cluster is performed.
:param pulumi.Input[str] name: Name of the snapshot. If omitted, the provider will assign a random, unique name. Conflicts with `name_prefix`.
:param pulumi.Input[str] node_type: Compute and memory capacity of the nodes in the cluster.
@@ -454,6 +460,8 @@ def __init__(__self__, *,
"""
if description is not None:
pulumi.set(__self__, "description", description)
+ if engine is not None:
+ pulumi.set(__self__, "engine", engine)
if engine_version is not None:
pulumi.set(__self__, "engine_version", engine_version)
if maintenance_window is not None:
@@ -491,11 +499,23 @@ def description(self) -> Optional[pulumi.Input[str]]:
def description(self, value: Optional[pulumi.Input[str]]):
pulumi.set(self, "description", value)
+ @property
+ @pulumi.getter
+ def engine(self) -> Optional[pulumi.Input[str]]:
+ """
+ The engine that will run on cluster nodes.
+ """
+ return pulumi.get(self, "engine")
+
+ @engine.setter
+ def engine(self, value: Optional[pulumi.Input[str]]):
+ pulumi.set(self, "engine", value)
+
@property
@pulumi.getter(name="engineVersion")
def engine_version(self) -> Optional[pulumi.Input[str]]:
"""
- Version number of the Redis engine used by the cluster.
+ Version number of the engine used by the cluster.
"""
return pulumi.get(self, "engine_version")
diff --git a/sdk/python/pulumi_aws/memorydb/cluster.py b/sdk/python/pulumi_aws/memorydb/cluster.py
index 90b26e0e482..b5873340430 100644
--- a/sdk/python/pulumi_aws/memorydb/cluster.py
+++ b/sdk/python/pulumi_aws/memorydb/cluster.py
@@ -26,6 +26,7 @@ def __init__(__self__, *,
auto_minor_version_upgrade: Optional[pulumi.Input[bool]] = None,
data_tiering: Optional[pulumi.Input[bool]] = None,
description: Optional[pulumi.Input[str]] = None,
+ engine: Optional[pulumi.Input[str]] = None,
engine_version: Optional[pulumi.Input[str]] = None,
final_snapshot_name: Optional[pulumi.Input[str]] = None,
kms_key_arn: Optional[pulumi.Input[str]] = None,
@@ -54,7 +55,8 @@ def __init__(__self__, *,
:param pulumi.Input[bool] auto_minor_version_upgrade: When set to `true`, the cluster will automatically receive minor engine version upgrades after launch. Defaults to `true`.
:param pulumi.Input[bool] data_tiering: Enables data tiering. This option is not supported by all instance types. For more information, see [Data tiering](https://docs.aws.amazon.com/memorydb/latest/devguide/data-tiering.html).
:param pulumi.Input[str] description: Description for the cluster. Defaults to `"Managed by Pulumi"`.
- :param pulumi.Input[str] engine_version: Version number of the Redis engine to be used for the cluster. Downgrades are not supported.
+ :param pulumi.Input[str] engine: The engine that will run on your nodes. Supported values are `redis` and `valkey`.
+ :param pulumi.Input[str] engine_version: Version number of the engine to be used for the cluster. Downgrades are not supported.
:param pulumi.Input[str] final_snapshot_name: Name of the final cluster snapshot to be created when this resource is deleted. If omitted, no final snapshot will be made.
:param pulumi.Input[str] kms_key_arn: ARN of the KMS key used to encrypt the cluster at rest.
:param pulumi.Input[str] maintenance_window: Specifies the weekly time range during which maintenance on the cluster is performed. Specify as a range in the format `ddd:hh24:mi-ddd:hh24:mi` (24H Clock UTC). The minimum maintenance window is a 60 minute period. Example: `sun:23:00-mon:01:30`.
@@ -82,6 +84,8 @@ def __init__(__self__, *,
pulumi.set(__self__, "data_tiering", data_tiering)
if description is not None:
pulumi.set(__self__, "description", description)
+ if engine is not None:
+ pulumi.set(__self__, "engine", engine)
if engine_version is not None:
pulumi.set(__self__, "engine_version", engine_version)
if final_snapshot_name is not None:
@@ -183,11 +187,23 @@ def description(self) -> Optional[pulumi.Input[str]]:
def description(self, value: Optional[pulumi.Input[str]]):
pulumi.set(self, "description", value)
+ @property
+ @pulumi.getter
+ def engine(self) -> Optional[pulumi.Input[str]]:
+ """
+ The engine that will run on your nodes. Supported values are `redis` and `valkey`.
+ """
+ return pulumi.get(self, "engine")
+
+ @engine.setter
+ def engine(self, value: Optional[pulumi.Input[str]]):
+ pulumi.set(self, "engine", value)
+
@property
@pulumi.getter(name="engineVersion")
def engine_version(self) -> Optional[pulumi.Input[str]]:
"""
- Version number of the Redis engine to be used for the cluster. Downgrades are not supported.
+ Version number of the engine to be used for the cluster. Downgrades are not supported.
"""
return pulumi.get(self, "engine_version")
@@ -421,6 +437,7 @@ def __init__(__self__, *,
cluster_endpoints: Optional[pulumi.Input[Sequence[pulumi.Input['ClusterClusterEndpointArgs']]]] = None,
data_tiering: Optional[pulumi.Input[bool]] = None,
description: Optional[pulumi.Input[str]] = None,
+ engine: Optional[pulumi.Input[str]] = None,
engine_patch_version: Optional[pulumi.Input[str]] = None,
engine_version: Optional[pulumi.Input[str]] = None,
final_snapshot_name: Optional[pulumi.Input[str]] = None,
@@ -451,8 +468,9 @@ def __init__(__self__, *,
:param pulumi.Input[bool] auto_minor_version_upgrade: When set to `true`, the cluster will automatically receive minor engine version upgrades after launch. Defaults to `true`.
:param pulumi.Input[bool] data_tiering: Enables data tiering. This option is not supported by all instance types. For more information, see [Data tiering](https://docs.aws.amazon.com/memorydb/latest/devguide/data-tiering.html).
:param pulumi.Input[str] description: Description for the cluster. Defaults to `"Managed by Pulumi"`.
- :param pulumi.Input[str] engine_patch_version: Patch version number of the Redis engine used by the cluster.
- :param pulumi.Input[str] engine_version: Version number of the Redis engine to be used for the cluster. Downgrades are not supported.
+ :param pulumi.Input[str] engine: The engine that will run on your nodes. Supported values are `redis` and `valkey`.
+ :param pulumi.Input[str] engine_patch_version: Patch version number of the engine used by the cluster.
+ :param pulumi.Input[str] engine_version: Version number of the engine to be used for the cluster. Downgrades are not supported.
:param pulumi.Input[str] final_snapshot_name: Name of the final cluster snapshot to be created when this resource is deleted. If omitted, no final snapshot will be made.
:param pulumi.Input[str] kms_key_arn: ARN of the KMS key used to encrypt the cluster at rest.
:param pulumi.Input[str] maintenance_window: Specifies the weekly time range during which maintenance on the cluster is performed. Specify as a range in the format `ddd:hh24:mi-ddd:hh24:mi` (24H Clock UTC). The minimum maintenance window is a 60 minute period. Example: `sun:23:00-mon:01:30`.
@@ -489,6 +507,8 @@ def __init__(__self__, *,
pulumi.set(__self__, "data_tiering", data_tiering)
if description is not None:
pulumi.set(__self__, "description", description)
+ if engine is not None:
+ pulumi.set(__self__, "engine", engine)
if engine_patch_version is not None:
pulumi.set(__self__, "engine_patch_version", engine_patch_version)
if engine_version is not None:
@@ -608,11 +628,23 @@ def description(self) -> Optional[pulumi.Input[str]]:
def description(self, value: Optional[pulumi.Input[str]]):
pulumi.set(self, "description", value)
+ @property
+ @pulumi.getter
+ def engine(self) -> Optional[pulumi.Input[str]]:
+ """
+ The engine that will run on your nodes. Supported values are `redis` and `valkey`.
+ """
+ return pulumi.get(self, "engine")
+
+ @engine.setter
+ def engine(self, value: Optional[pulumi.Input[str]]):
+ pulumi.set(self, "engine", value)
+
@property
@pulumi.getter(name="enginePatchVersion")
def engine_patch_version(self) -> Optional[pulumi.Input[str]]:
"""
- Patch version number of the Redis engine used by the cluster.
+ Patch version number of the engine used by the cluster.
"""
return pulumi.get(self, "engine_patch_version")
@@ -624,7 +656,7 @@ def engine_patch_version(self, value: Optional[pulumi.Input[str]]):
@pulumi.getter(name="engineVersion")
def engine_version(self) -> Optional[pulumi.Input[str]]:
"""
- Version number of the Redis engine to be used for the cluster. Downgrades are not supported.
+ Version number of the engine to be used for the cluster. Downgrades are not supported.
"""
return pulumi.get(self, "engine_version")
@@ -897,6 +929,7 @@ def __init__(__self__,
auto_minor_version_upgrade: Optional[pulumi.Input[bool]] = None,
data_tiering: Optional[pulumi.Input[bool]] = None,
description: Optional[pulumi.Input[str]] = None,
+ engine: Optional[pulumi.Input[str]] = None,
engine_version: Optional[pulumi.Input[str]] = None,
final_snapshot_name: Optional[pulumi.Input[str]] = None,
kms_key_arn: Optional[pulumi.Input[str]] = None,
@@ -933,6 +966,8 @@ def __init__(__self__,
acl_name="open-access",
name="my-cluster",
node_type="db.t4g.small",
+ engine="redis",
+ engine_version="7.1",
num_shards=2,
security_group_ids=[example_aws_security_group["id"]],
snapshot_retention_limit=7,
@@ -953,7 +988,8 @@ def __init__(__self__,
:param pulumi.Input[bool] auto_minor_version_upgrade: When set to `true`, the cluster will automatically receive minor engine version upgrades after launch. Defaults to `true`.
:param pulumi.Input[bool] data_tiering: Enables data tiering. This option is not supported by all instance types. For more information, see [Data tiering](https://docs.aws.amazon.com/memorydb/latest/devguide/data-tiering.html).
:param pulumi.Input[str] description: Description for the cluster. Defaults to `"Managed by Pulumi"`.
- :param pulumi.Input[str] engine_version: Version number of the Redis engine to be used for the cluster. Downgrades are not supported.
+ :param pulumi.Input[str] engine: The engine that will run on your nodes. Supported values are `redis` and `valkey`.
+ :param pulumi.Input[str] engine_version: Version number of the engine to be used for the cluster. Downgrades are not supported.
:param pulumi.Input[str] final_snapshot_name: Name of the final cluster snapshot to be created when this resource is deleted. If omitted, no final snapshot will be made.
:param pulumi.Input[str] kms_key_arn: ARN of the KMS key used to encrypt the cluster at rest.
:param pulumi.Input[str] maintenance_window: Specifies the weekly time range during which maintenance on the cluster is performed. Specify as a range in the format `ddd:hh24:mi-ddd:hh24:mi` (24H Clock UTC). The minimum maintenance window is a 60 minute period. Example: `sun:23:00-mon:01:30`.
@@ -997,6 +1033,8 @@ def __init__(__self__,
acl_name="open-access",
name="my-cluster",
node_type="db.t4g.small",
+ engine="redis",
+ engine_version="7.1",
num_shards=2,
security_group_ids=[example_aws_security_group["id"]],
snapshot_retention_limit=7,
@@ -1030,6 +1068,7 @@ def _internal_init(__self__,
auto_minor_version_upgrade: Optional[pulumi.Input[bool]] = None,
data_tiering: Optional[pulumi.Input[bool]] = None,
description: Optional[pulumi.Input[str]] = None,
+ engine: Optional[pulumi.Input[str]] = None,
engine_version: Optional[pulumi.Input[str]] = None,
final_snapshot_name: Optional[pulumi.Input[str]] = None,
kms_key_arn: Optional[pulumi.Input[str]] = None,
@@ -1065,6 +1104,7 @@ def _internal_init(__self__,
__props__.__dict__["auto_minor_version_upgrade"] = auto_minor_version_upgrade
__props__.__dict__["data_tiering"] = data_tiering
__props__.__dict__["description"] = description
+ __props__.__dict__["engine"] = engine
__props__.__dict__["engine_version"] = engine_version
__props__.__dict__["final_snapshot_name"] = final_snapshot_name
__props__.__dict__["kms_key_arn"] = kms_key_arn
@@ -1108,6 +1148,7 @@ def get(resource_name: str,
cluster_endpoints: Optional[pulumi.Input[Sequence[pulumi.Input[Union['ClusterClusterEndpointArgs', 'ClusterClusterEndpointArgsDict']]]]] = None,
data_tiering: Optional[pulumi.Input[bool]] = None,
description: Optional[pulumi.Input[str]] = None,
+ engine: Optional[pulumi.Input[str]] = None,
engine_patch_version: Optional[pulumi.Input[str]] = None,
engine_version: Optional[pulumi.Input[str]] = None,
final_snapshot_name: Optional[pulumi.Input[str]] = None,
@@ -1143,8 +1184,9 @@ def get(resource_name: str,
:param pulumi.Input[bool] auto_minor_version_upgrade: When set to `true`, the cluster will automatically receive minor engine version upgrades after launch. Defaults to `true`.
:param pulumi.Input[bool] data_tiering: Enables data tiering. This option is not supported by all instance types. For more information, see [Data tiering](https://docs.aws.amazon.com/memorydb/latest/devguide/data-tiering.html).
:param pulumi.Input[str] description: Description for the cluster. Defaults to `"Managed by Pulumi"`.
- :param pulumi.Input[str] engine_patch_version: Patch version number of the Redis engine used by the cluster.
- :param pulumi.Input[str] engine_version: Version number of the Redis engine to be used for the cluster. Downgrades are not supported.
+ :param pulumi.Input[str] engine: The engine that will run on your nodes. Supported values are `redis` and `valkey`.
+ :param pulumi.Input[str] engine_patch_version: Patch version number of the engine used by the cluster.
+ :param pulumi.Input[str] engine_version: Version number of the engine to be used for the cluster. Downgrades are not supported.
:param pulumi.Input[str] final_snapshot_name: Name of the final cluster snapshot to be created when this resource is deleted. If omitted, no final snapshot will be made.
:param pulumi.Input[str] kms_key_arn: ARN of the KMS key used to encrypt the cluster at rest.
:param pulumi.Input[str] maintenance_window: Specifies the weekly time range during which maintenance on the cluster is performed. Specify as a range in the format `ddd:hh24:mi-ddd:hh24:mi` (24H Clock UTC). The minimum maintenance window is a 60 minute period. Example: `sun:23:00-mon:01:30`.
@@ -1179,6 +1221,7 @@ def get(resource_name: str,
__props__.__dict__["cluster_endpoints"] = cluster_endpoints
__props__.__dict__["data_tiering"] = data_tiering
__props__.__dict__["description"] = description
+ __props__.__dict__["engine"] = engine
__props__.__dict__["engine_patch_version"] = engine_patch_version
__props__.__dict__["engine_version"] = engine_version
__props__.__dict__["final_snapshot_name"] = final_snapshot_name
@@ -1249,11 +1292,19 @@ def description(self) -> pulumi.Output[Optional[str]]:
"""
return pulumi.get(self, "description")
+ @property
+ @pulumi.getter
+ def engine(self) -> pulumi.Output[str]:
+ """
+ The engine that will run on your nodes. Supported values are `redis` and `valkey`.
+ """
+ return pulumi.get(self, "engine")
+
@property
@pulumi.getter(name="enginePatchVersion")
def engine_patch_version(self) -> pulumi.Output[str]:
"""
- Patch version number of the Redis engine used by the cluster.
+ Patch version number of the engine used by the cluster.
"""
return pulumi.get(self, "engine_patch_version")
@@ -1261,7 +1312,7 @@ def engine_patch_version(self) -> pulumi.Output[str]:
@pulumi.getter(name="engineVersion")
def engine_version(self) -> pulumi.Output[str]:
"""
- Version number of the Redis engine to be used for the cluster. Downgrades are not supported.
+ Version number of the engine to be used for the cluster. Downgrades are not supported.
"""
return pulumi.get(self, "engine_version")
diff --git a/sdk/python/pulumi_aws/memorydb/get_cluster.py b/sdk/python/pulumi_aws/memorydb/get_cluster.py
index 3152a56058c..505fd8b8b53 100644
--- a/sdk/python/pulumi_aws/memorydb/get_cluster.py
+++ b/sdk/python/pulumi_aws/memorydb/get_cluster.py
@@ -27,7 +27,7 @@ class GetClusterResult:
"""
A collection of values returned by getCluster.
"""
- def __init__(__self__, acl_name=None, arn=None, auto_minor_version_upgrade=None, cluster_endpoints=None, data_tiering=None, description=None, engine_patch_version=None, engine_version=None, final_snapshot_name=None, id=None, kms_key_arn=None, maintenance_window=None, name=None, node_type=None, num_replicas_per_shard=None, num_shards=None, parameter_group_name=None, port=None, security_group_ids=None, shards=None, snapshot_retention_limit=None, snapshot_window=None, sns_topic_arn=None, subnet_group_name=None, tags=None, tls_enabled=None):
+ def __init__(__self__, acl_name=None, arn=None, auto_minor_version_upgrade=None, cluster_endpoints=None, data_tiering=None, description=None, engine=None, engine_patch_version=None, engine_version=None, final_snapshot_name=None, id=None, kms_key_arn=None, maintenance_window=None, name=None, node_type=None, num_replicas_per_shard=None, num_shards=None, parameter_group_name=None, port=None, security_group_ids=None, shards=None, snapshot_retention_limit=None, snapshot_window=None, sns_topic_arn=None, subnet_group_name=None, tags=None, tls_enabled=None):
if acl_name and not isinstance(acl_name, str):
raise TypeError("Expected argument 'acl_name' to be a str")
pulumi.set(__self__, "acl_name", acl_name)
@@ -46,6 +46,9 @@ def __init__(__self__, acl_name=None, arn=None, auto_minor_version_upgrade=None,
if description and not isinstance(description, str):
raise TypeError("Expected argument 'description' to be a str")
pulumi.set(__self__, "description", description)
+ if engine and not isinstance(engine, str):
+ raise TypeError("Expected argument 'engine' to be a str")
+ pulumi.set(__self__, "engine", engine)
if engine_patch_version and not isinstance(engine_patch_version, str):
raise TypeError("Expected argument 'engine_patch_version' to be a str")
pulumi.set(__self__, "engine_patch_version", engine_patch_version)
@@ -152,11 +155,19 @@ def description(self) -> str:
"""
return pulumi.get(self, "description")
+ @property
+ @pulumi.getter
+ def engine(self) -> str:
+ """
+ Engine that will run on cluster nodes.
+ """
+ return pulumi.get(self, "engine")
+
@property
@pulumi.getter(name="enginePatchVersion")
def engine_patch_version(self) -> str:
"""
- Patch version number of the Redis engine used by the cluster.
+ Patch version number of the engine used by the cluster.
"""
return pulumi.get(self, "engine_patch_version")
@@ -164,7 +175,7 @@ def engine_patch_version(self) -> str:
@pulumi.getter(name="engineVersion")
def engine_version(self) -> str:
"""
- Version number of the Redis engine used by the cluster.
+ Version number of the engine used by the cluster.
"""
return pulumi.get(self, "engine_version")
@@ -325,6 +336,7 @@ def __await__(self):
cluster_endpoints=self.cluster_endpoints,
data_tiering=self.data_tiering,
description=self.description,
+ engine=self.engine,
engine_patch_version=self.engine_patch_version,
engine_version=self.engine_version,
final_snapshot_name=self.final_snapshot_name,
@@ -379,6 +391,7 @@ def get_cluster(name: Optional[str] = None,
cluster_endpoints=pulumi.get(__ret__, 'cluster_endpoints'),
data_tiering=pulumi.get(__ret__, 'data_tiering'),
description=pulumi.get(__ret__, 'description'),
+ engine=pulumi.get(__ret__, 'engine'),
engine_patch_version=pulumi.get(__ret__, 'engine_patch_version'),
engine_version=pulumi.get(__ret__, 'engine_version'),
final_snapshot_name=pulumi.get(__ret__, 'final_snapshot_name'),
@@ -430,6 +443,7 @@ def get_cluster_output(name: Optional[pulumi.Input[str]] = None,
cluster_endpoints=pulumi.get(__response__, 'cluster_endpoints'),
data_tiering=pulumi.get(__response__, 'data_tiering'),
description=pulumi.get(__response__, 'description'),
+ engine=pulumi.get(__response__, 'engine'),
engine_patch_version=pulumi.get(__response__, 'engine_patch_version'),
engine_version=pulumi.get(__response__, 'engine_version'),
final_snapshot_name=pulumi.get(__response__, 'final_snapshot_name'),
diff --git a/sdk/python/pulumi_aws/memorydb/outputs.py b/sdk/python/pulumi_aws/memorydb/outputs.py
index 3d71de6b3fc..eef97716aa0 100644
--- a/sdk/python/pulumi_aws/memorydb/outputs.py
+++ b/sdk/python/pulumi_aws/memorydb/outputs.py
@@ -304,6 +304,7 @@ def get(self, key: str, default = None) -> Any:
def __init__(__self__, *,
description: Optional[str] = None,
+ engine: Optional[str] = None,
engine_version: Optional[str] = None,
maintenance_window: Optional[str] = None,
name: Optional[str] = None,
@@ -318,7 +319,8 @@ def __init__(__self__, *,
vpc_id: Optional[str] = None):
"""
:param str description: Description for the cluster.
- :param str engine_version: Version number of the Redis engine used by the cluster.
+ :param str engine: The engine that will run on cluster nodes.
+ :param str engine_version: Version number of the engine used by the cluster.
:param str maintenance_window: The weekly time range during which maintenance on the cluster is performed.
:param str name: Name of the snapshot. If omitted, the provider will assign a random, unique name. Conflicts with `name_prefix`.
:param str node_type: Compute and memory capacity of the nodes in the cluster.
@@ -333,6 +335,8 @@ def __init__(__self__, *,
"""
if description is not None:
pulumi.set(__self__, "description", description)
+ if engine is not None:
+ pulumi.set(__self__, "engine", engine)
if engine_version is not None:
pulumi.set(__self__, "engine_version", engine_version)
if maintenance_window is not None:
@@ -366,11 +370,19 @@ def description(self) -> Optional[str]:
"""
return pulumi.get(self, "description")
+ @property
+ @pulumi.getter
+ def engine(self) -> Optional[str]:
+ """
+ The engine that will run on cluster nodes.
+ """
+ return pulumi.get(self, "engine")
+
@property
@pulumi.getter(name="engineVersion")
def engine_version(self) -> Optional[str]:
"""
- Version number of the Redis engine used by the cluster.
+ Version number of the engine used by the cluster.
"""
return pulumi.get(self, "engine_version")
@@ -711,6 +723,7 @@ def value(self) -> str:
class GetSnapshotClusterConfigurationResult(dict):
def __init__(__self__, *,
description: str,
+ engine: str,
engine_version: str,
maintenance_window: str,
name: str,
@@ -725,7 +738,8 @@ def __init__(__self__, *,
vpc_id: str):
"""
:param str description: Description for the cluster.
- :param str engine_version: Version number of the Redis engine used by the cluster.
+ :param str engine: The engine that will run on cluster nodes.
+ :param str engine_version: Version number of the engine used by the cluster.
:param str maintenance_window: The weekly time range during which maintenance on the cluster is performed.
:param str name: Name of the snapshot.
:param str node_type: Compute and memory capacity of the nodes in the cluster.
@@ -739,6 +753,7 @@ def __init__(__self__, *,
:param str vpc_id: The VPC in which the cluster exists.
"""
pulumi.set(__self__, "description", description)
+ pulumi.set(__self__, "engine", engine)
pulumi.set(__self__, "engine_version", engine_version)
pulumi.set(__self__, "maintenance_window", maintenance_window)
pulumi.set(__self__, "name", name)
@@ -760,11 +775,19 @@ def description(self) -> str:
"""
return pulumi.get(self, "description")
+ @property
+ @pulumi.getter
+ def engine(self) -> str:
+ """
+ The engine that will run on cluster nodes.
+ """
+ return pulumi.get(self, "engine")
+
@property
@pulumi.getter(name="engineVersion")
def engine_version(self) -> str:
"""
- Version number of the Redis engine used by the cluster.
+ Version number of the engine used by the cluster.
"""
return pulumi.get(self, "engine_version")
diff --git a/sdk/python/pulumi_aws/s3/bucket_lifecycle_configuration_v2.py b/sdk/python/pulumi_aws/s3/bucket_lifecycle_configuration_v2.py
index fd057e427ea..cc35a49e29f 100644
--- a/sdk/python/pulumi_aws/s3/bucket_lifecycle_configuration_v2.py
+++ b/sdk/python/pulumi_aws/s3/bucket_lifecycle_configuration_v2.py
@@ -181,14 +181,12 @@ def __init__(__self__,
For more information see the Amazon S3 User Guide on [`Lifecycle Configuration Elements`](https://docs.aws.amazon.com/AmazonS3/latest/userguide/intro-lifecycle-rules.html).
- > **NOTE:** S3 Buckets only support a single lifecycle configuration. Declaring multiple `s3.BucketLifecycleConfigurationV2` resources to the same S3 Bucket will cause a perpetual difference in configuration.
+ > S3 Buckets only support a single lifecycle configuration. Declaring multiple `s3.BucketLifecycleConfigurationV2` resources to the same S3 Bucket will cause a perpetual difference in configuration.
- > **NOTE:** Lifecycle configurations may take some time to fully propagate to all AWS S3 systems.
+ > Lifecycle configurations may take some time to fully propagate to all AWS S3 systems.
Running Pulumi operations shortly after creating a lifecycle configuration may result in changes that affect configuration idempotence.
See the Amazon S3 User Guide on [setting lifecycle configuration on a bucket](https://docs.aws.amazon.com/AmazonS3/latest/userguide/how-to-set-lifecycle-configuration-intro.html).
- > This resource cannot be used with S3 directory buckets.
-
## Example Usage
### With neither a filter nor prefix specified
@@ -477,7 +475,7 @@ def __init__(__self__,
If the owner (account ID) of the source bucket differs from the account used to configure the AWS Provider, import using the `bucket` and `expected_bucket_owner` separated by a comma (`,`):
- __Using `pulumi import` to import__ S3 bucket lifecycle configuration using the `bucket` or using the `bucket` and `expected_bucket_owner` separated by a comma (`,`). For example:
+ Using `pulumi import`, import an S3 bucket lifecycle configuration using the `bucket` or the `bucket` and `expected_bucket_owner` separated by a comma (`,`). For example:
If the owner (account ID) of the source bucket is the same account used to configure the AWS Provider, import using the `bucket`:
@@ -514,14 +512,12 @@ def __init__(__self__,
For more information see the Amazon S3 User Guide on [`Lifecycle Configuration Elements`](https://docs.aws.amazon.com/AmazonS3/latest/userguide/intro-lifecycle-rules.html).
- > **NOTE:** S3 Buckets only support a single lifecycle configuration. Declaring multiple `s3.BucketLifecycleConfigurationV2` resources to the same S3 Bucket will cause a perpetual difference in configuration.
+ > S3 Buckets only support a single lifecycle configuration. Declaring multiple `s3.BucketLifecycleConfigurationV2` resources to the same S3 Bucket will cause a perpetual difference in configuration.
- > **NOTE:** Lifecycle configurations may take some time to fully propagate to all AWS S3 systems.
+ > Lifecycle configurations may take some time to fully propagate to all AWS S3 systems.
Running Pulumi operations shortly after creating a lifecycle configuration may result in changes that affect configuration idempotence.
See the Amazon S3 User Guide on [setting lifecycle configuration on a bucket](https://docs.aws.amazon.com/AmazonS3/latest/userguide/how-to-set-lifecycle-configuration-intro.html).
- > This resource cannot be used with S3 directory buckets.
-
## Example Usage
### With neither a filter nor prefix specified
@@ -810,7 +806,7 @@ def __init__(__self__,
If the owner (account ID) of the source bucket differs from the account used to configure the AWS Provider, import using the `bucket` and `expected_bucket_owner` separated by a comma (`,`):
- __Using `pulumi import` to import__ S3 bucket lifecycle configuration using the `bucket` or using the `bucket` and `expected_bucket_owner` separated by a comma (`,`). For example:
+ Using `pulumi import`, import an S3 bucket lifecycle configuration using the `bucket` or the `bucket` and `expected_bucket_owner` separated by a comma (`,`). For example:
If the owner (account ID) of the source bucket is the same account used to configure the AWS Provider, import using the `bucket`:
diff --git a/upstream b/upstream
index 6ea8ba35a5c..ed4d7f5ef98 160000
--- a/upstream
+++ b/upstream
@@ -1 +1 @@
-Subproject commit 6ea8ba35a5ce809541a45b3f99076f9537c37baa
+Subproject commit ed4d7f5ef981f42ea7de09d440af3507d0cba081