@pulumi/aws 7.0.0-alpha.2 → 7.0.0-rc.1

package/networkfirewall/firewallPolicy.js

@@ -14,6 +14,9 @@ const utilities = require("../utilities");
  * import * as pulumi from "@pulumi/pulumi";
  * import * as aws from "@pulumi/aws";
  *
+ * const current = aws.getRegion({});
+ * const currentGetPartition = aws.getPartition({});
+ * const currentGetCallerIdentity = aws.getCallerIdentity({});
  * const example = new aws.networkfirewall.FirewallPolicy("example", {
  *     name: "example",
  *     firewallPolicy: {
@@ -23,7 +26,7 @@ const utilities = require("../utilities");
  *             priority: 1,
  *             resourceArn: exampleAwsNetworkfirewallRuleGroup.arn,
  *         }],
- *         tlsInspectionConfigurationArn: "arn:aws:network-firewall:REGION:ACCT:tls-configuration/example",
+ *         tlsInspectionConfigurationArn: Promise.all([currentGetPartition, current, currentGetCallerIdentity]).then(([currentGetPartition, current, currentGetCallerIdentity]) => `arn:${currentGetPartition.partition}:network-firewall:${current.region}:${currentGetCallerIdentity.accountId}:tls-configuration/example`),
  *     },
  *     tags: {
  *         Tag1: "Value1",
@@ -72,7 +75,7 @@ const utilities = require("../utilities");
  * import * as pulumi from "@pulumi/pulumi";
  * import * as aws from "@pulumi/aws";
  *
- * const test = new aws.networkfirewall.FirewallPolicy("test", {
+ * const example = new aws.networkfirewall.FirewallPolicy("example", {
  *     name: "example",
  *     firewallPolicy: {
  *         statelessDefaultActions: [
@@ -94,6 +97,52 @@ const utilities = require("../utilities");
  * });
  * ```
  *
+ * ## Policy with Active Threat Defense in Action Order
+ *
+ * ```typescript
+ * import * as pulumi from "@pulumi/pulumi";
+ * import * as aws from "@pulumi/aws";
+ *
+ * const current = aws.getRegion({});
+ * const currentGetPartition = aws.getPartition({});
+ * const example = new aws.networkfirewall.FirewallPolicy("example", {
+ *     name: "example",
+ *     firewallPolicy: {
+ *         statelessFragmentDefaultActions: ["aws:drop"],
+ *         statelessDefaultActions: ["aws:pass"],
+ *         statefulRuleGroupReferences: [{
+ *             deepThreatInspection: "true",
+ *             resourceArn: Promise.all([currentGetPartition, current]).then(([currentGetPartition, current]) => `arn:${currentGetPartition.partition}:network-firewall:${current.region}:aws-managed:stateful-rulegroup/AttackInfrastructureActionOrder`),
+ *         }],
+ *     },
+ * });
+ * ```
+ *
+ * ## Policy with Active Threat Defense in Strict Order
+ *
+ * ```typescript
+ * import * as pulumi from "@pulumi/pulumi";
+ * import * as aws from "@pulumi/aws";
+ *
+ * const current = aws.getRegion({});
+ * const currentGetPartition = aws.getPartition({});
+ * const example = new aws.networkfirewall.FirewallPolicy("example", {
+ *     name: "example",
+ *     firewallPolicy: {
+ *         statelessFragmentDefaultActions: ["aws:drop"],
+ *         statelessDefaultActions: ["aws:pass"],
+ *         statefulEngineOptions: {
+ *             ruleOrder: "STRICT_ORDER",
+ *         },
+ *         statefulRuleGroupReferences: [{
+ *             deepThreatInspection: "false",
+ *             priority: 1,
+ *             resourceArn: Promise.all([currentGetPartition, current]).then(([currentGetPartition, current]) => `arn:${currentGetPartition.partition}:network-firewall:${current.region}:aws-managed:stateful-rulegroup/AttackInfrastructureStrictOrder`),
+ *         }],
+ *     },
+ * });
+ * ```
+ *
  * ## Import
  *
  * Using `pulumi import`, import Network Firewall Policies using their `arn`. For example:

package/networkfirewall/firewallPolicy.js.map

@@ -1 +1 @@
-{"version":3,"file":"firewallPolicy.js","sourceRoot":"","sources":["../../networkfirewall/firewallPolicy.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"firewallPolicy.js","sourceRoot":"","sources":["../../networkfirewall/firewallPolicy.ts"],"names":[],"mappings":"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"}

package/networkmanager/dxGatewayAttachment.d.ts

@@ -17,7 +17,7 @@ import * as outputs from "../types/output";
  * const test = new aws.networkmanager.DxGatewayAttachment("test", {
  *     coreNetworkId: testAwsNetworkmanagerCoreNetworkPolicyAttachment.coreNetworkId,
  *     directConnectGatewayArn: `arn:aws:directconnect::${current.accountId}:dx-gateway/${testAwsDxGateway.id}`,
- *     edgeLocations: [currentAwsRegion.name],
+ *     edgeLocations: [currentAwsRegion.region],
  * });
  * ```
  *

package/networkmanager/dxGatewayAttachment.js

@@ -21,7 +21,7 @@ const utilities = require("../utilities");
  * const test = new aws.networkmanager.DxGatewayAttachment("test", {
  *     coreNetworkId: testAwsNetworkmanagerCoreNetworkPolicyAttachment.coreNetworkId,
  *     directConnectGatewayArn: `arn:aws:directconnect::${current.accountId}:dx-gateway/${testAwsDxGateway.id}`,
- *     edgeLocations: [currentAwsRegion.name],
+ *     edgeLocations: [currentAwsRegion.region],
  * });
  * ```
  *

package/opensearch/domain.d.ts

@@ -61,7 +61,7 @@ import * as outputs from "../types/output";
  *             identifiers: ["*"],
  *         }],
  *         actions: ["es:*"],
- *         resources: [`arn:aws:es:${current.name}:${currentGetCallerIdentity.accountId}:domain/${domain}/*`],
+ *         resources: [`arn:aws:es:${current.region}:${currentGetCallerIdentity.accountId}:domain/${domain}/*`],
  *         conditions: [{
  *             test: "IpAddress",
  *             variable: "aws:SourceIp",
@@ -152,7 +152,7 @@ import * as outputs from "../types/output";
  *             identifiers: ["*"],
  *         }],
  *         actions: ["es:*"],
- *         resources: [`arn:aws:es:${current.name}:${currentGetCallerIdentity.accountId}:domain/${domain}/*`],
+ *         resources: [`arn:aws:es:${current.region}:${currentGetCallerIdentity.accountId}:domain/${domain}/*`],
  *     }],
  * }));
  * const exampleDomain = new aws.opensearch.Domain("example", {

package/opensearch/domain.js

@@ -65,7 +65,7 @@ const utilities = require("../utilities");
  *             identifiers: ["*"],
  *         }],
  *         actions: ["es:*"],
- *         resources: [`arn:aws:es:${current.name}:${currentGetCallerIdentity.accountId}:domain/${domain}/*`],
+ *         resources: [`arn:aws:es:${current.region}:${currentGetCallerIdentity.accountId}:domain/${domain}/*`],
  *         conditions: [{
  *             test: "IpAddress",
  *             variable: "aws:SourceIp",
@@ -156,7 +156,7 @@ const utilities = require("../utilities");
  *             identifiers: ["*"],
  *         }],
  *         actions: ["es:*"],
- *         resources: [`arn:aws:es:${current.name}:${currentGetCallerIdentity.accountId}:domain/${domain}/*`],
+ *         resources: [`arn:aws:es:${current.region}:${currentGetCallerIdentity.accountId}:domain/${domain}/*`],
  *     }],
  * }));
  * const exampleDomain = new aws.opensearch.Domain("example", {

package/opensearch/inboundConnectionAccepter.d.ts

@@ -16,12 +16,12 @@ import * as pulumi from "@pulumi/pulumi";
  *     connectionAlias: "outbound_connection",
  *     localDomainInfo: {
  *         ownerId: current.then(current => current.accountId),
- *         region: currentGetRegion.then(currentGetRegion => currentGetRegion.name),
+ *         region: currentGetRegion.then(currentGetRegion => currentGetRegion.region),
  *         domainName: localDomain.domainName,
  *     },
  *     remoteDomainInfo: {
  *         ownerId: current.then(current => current.accountId),
- *         region: currentGetRegion.then(currentGetRegion => currentGetRegion.name),
+ *         region: currentGetRegion.then(currentGetRegion => currentGetRegion.region),
  *         domainName: remoteDomain.domainName,
  *     },
  * });

package/opensearch/inboundConnectionAccepter.js

@@ -22,12 +22,12 @@ const utilities = require("../utilities");
  *     connectionAlias: "outbound_connection",
  *     localDomainInfo: {
  *         ownerId: current.then(current => current.accountId),
- *         region: currentGetRegion.then(currentGetRegion => currentGetRegion.name),
+ *         region: currentGetRegion.then(currentGetRegion => currentGetRegion.region),
  *         domainName: localDomain.domainName,
  *     },
  *     remoteDomainInfo: {
  *         ownerId: current.then(current => current.accountId),
- *         region: currentGetRegion.then(currentGetRegion => currentGetRegion.name),
+ *         region: currentGetRegion.then(currentGetRegion => currentGetRegion.region),
  *         domainName: remoteDomain.domainName,
  *     },
  * });

package/opensearch/outboundConnection.d.ts

@@ -19,12 +19,12 @@ import * as outputs from "../types/output";
  *     connectionMode: "DIRECT",
  *     localDomainInfo: {
  *         ownerId: current.then(current => current.accountId),
- *         region: currentGetRegion.then(currentGetRegion => currentGetRegion.name),
+ *         region: currentGetRegion.then(currentGetRegion => currentGetRegion.region),
  *         domainName: localDomain.domainName,
  *     },
  *     remoteDomainInfo: {
  *         ownerId: current.then(current => current.accountId),
- *         region: currentGetRegion.then(currentGetRegion => currentGetRegion.name),
+ *         region: currentGetRegion.then(currentGetRegion => currentGetRegion.region),
  *         domainName: remoteDomain.domainName,
  *     },
  * });

package/opensearch/outboundConnection.js

@@ -23,12 +23,12 @@ const utilities = require("../utilities");
  *     connectionMode: "DIRECT",
  *     localDomainInfo: {
  *         ownerId: current.then(current => current.accountId),
- *         region: currentGetRegion.then(currentGetRegion => currentGetRegion.name),
+ *         region: currentGetRegion.then(currentGetRegion => currentGetRegion.region),
  *         domainName: localDomain.domainName,
  *     },
  *     remoteDomainInfo: {
  *         ownerId: current.then(current => current.accountId),
- *         region: currentGetRegion.then(currentGetRegion => currentGetRegion.name),
+ *         region: currentGetRegion.then(currentGetRegion => currentGetRegion.region),
  *         domainName: remoteDomain.domainName,
  *     },
  * });

package/opensearchingest/pipeline.d.ts

@@ -35,7 +35,7 @@ import * as outputs from "../types/output";
  *     - s3:
  *         aws:
  *           sts_role_arn: "${arn}"
- *           region: "${current.name}"
+ *           region: "${current.region}"
  *         bucket: "example"
  *         threshold:
  *           event_collect_timeout: "60s"

package/opensearchingest/pipeline.js

@@ -39,7 +39,7 @@ const utilities = require("../utilities");
  *     - s3:
  *         aws:
  *           sts_role_arn: "${arn}"
- *           region: "${current.name}"
+ *           region: "${current.region}"
  *         bucket: "example"
  *         threshold:
  *           event_collect_timeout: "60s"

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@pulumi/aws",
-    "version": "7.0.0-alpha.2",
+    "version": "7.0.0-rc.1",
     "description": "A Pulumi package for creating and managing Amazon Web Services (AWS) cloud resources.",
     "keywords": [
         "pulumi",
@@ -24,6 +24,6 @@
     "pulumi": {
         "resource": true,
         "name": "aws",
-        "version": "7.0.0-alpha.2"
+        "version": "7.0.0-rc.1"
     }
 }

package/quicksight/dataSource.d.ts

@@ -42,7 +42,7 @@ import * as outputs from "../types/output";
  *     key: "manifest.json",
  *     content: pulumi.jsonStringify({
  *         fileLocations: [{
- *             URIPrefixes: [pulumi.all([example.id, currentGetRegion, currentGetPartition]).apply(([id, currentGetRegion, currentGetPartition]) => `https://${id}.s3-${currentGetRegion.name}.${currentGetPartition.dnsSuffix}`)],
+ *             URIPrefixes: [pulumi.all([example.id, currentGetRegion, currentGetPartition]).apply(([id, currentGetRegion, currentGetPartition]) => `https://${id}.s3-${currentGetRegion.region}.${currentGetPartition.dnsSuffix}`)],
  *         }],
  *         globalUploadSettings: {
  *             format: "CSV",

package/quicksight/dataSource.js

@@ -46,7 +46,7 @@ const utilities = require("../utilities");
  *     key: "manifest.json",
  *     content: pulumi.jsonStringify({
  *         fileLocations: [{
- *             URIPrefixes: [pulumi.all([example.id, currentGetRegion, currentGetPartition]).apply(([id, currentGetRegion, currentGetPartition]) => `https://${id}.s3-${currentGetRegion.name}.${currentGetPartition.dnsSuffix}`)],
+ *             URIPrefixes: [pulumi.all([example.id, currentGetRegion, currentGetPartition]).apply(([id, currentGetRegion, currentGetPartition]) => `https://${id}.s3-${currentGetRegion.region}.${currentGetPartition.dnsSuffix}`)],
  *         }],
  *         globalUploadSettings: {
  *             format: "CSV",

package/rbin/rule.d.ts

@@ -13,7 +13,7 @@ import * as outputs from "../types/output";
  * import * as aws from "@pulumi/aws";
  *
  * const example = new aws.rbin.Rule("example", {
- *     description: "example_rule",
+ *     description: "Example tag-level retention rule",
  *     resourceType: "EBS_SNAPSHOT",
  *     resourceTags: [{
  *         resourceTagKey: "tag_key",
@@ -29,6 +29,29 @@ import * as outputs from "../types/output";
  * });
  * ```
  *
+ * ### Region-Level Retention Rule
+ *
+ * ```typescript
+ * import * as pulumi from "@pulumi/pulumi";
+ * import * as aws from "@pulumi/aws";
+ *
+ * const example = new aws.rbin.Rule("example", {
+ *     description: "Example region-level retention rule with exclusion tags",
+ *     resourceType: "EC2_IMAGE",
+ *     excludeResourceTags: [{
+ *         resourceTagKey: "tag_key",
+ *         resourceTagValue: "tag_value",
+ *     }],
+ *     retentionPeriod: {
+ *         retentionPeriodValue: 10,
+ *         retentionPeriodUnit: "DAYS",
+ *     },
+ *     tags: {
+ *         test_tag_key: "test_tag_value",
+ *     },
+ * });
+ * ```
+ *
  * ## Import
  *
  * Using `pulumi import`, import RBin Rule using the `id`. For example:
@@ -55,19 +78,23 @@ export declare class Rule extends pulumi.CustomResource {
     static isInstance(obj: any): obj is Rule;
     readonly arn: pulumi.Output<string>;
     /**
-     * The retention rule description.
+     * Retention rule description.
      */
     readonly description: pulumi.Output<string>;
+    /**
+     * Exclusion tags to use to identify resources that are to be excluded, or ignored, by a Region-level retention rule. See `excludeResourceTags` below.
+     */
+    readonly excludeResourceTags: pulumi.Output<outputs.rbin.RuleExcludeResourceTag[] | undefined>;
     /**
      * Information about the retention rule lock configuration. See `lockConfiguration` below.
      */
     readonly lockConfiguration: pulumi.Output<outputs.rbin.RuleLockConfiguration | undefined>;
     /**
-     * (Timestamp) The date and time at which the unlock delay is set to expire. Only returned for retention rules that have been unlocked and that are still within the unlock delay period.
+     * (Timestamp) Date and time at which the unlock delay is set to expire. Only returned for retention rules that have been unlocked and that are still within the unlock delay period.
      */
     readonly lockEndTime: pulumi.Output<string>;
     /**
-     * (Optional) The lock state of the retention rules to list. Only retention rules with the specified lock state are returned. Valid values are `locked`, `pendingUnlock`, `unlocked`.
+     * (Optional) Lock state of the retention rules to list. Only retention rules with the specified lock state are returned. Valid values are `locked`, `pendingUnlock`, `unlocked`.
      */
     readonly lockState: pulumi.Output<string>;
     /**
@@ -75,11 +102,11 @@ export declare class Rule extends pulumi.CustomResource {
      */
     readonly region: pulumi.Output<string>;
     /**
-     * Specifies the resource tags to use to identify resources that are to be retained by a tag-level retention rule. See `resourceTags` below.
+     * Resource tags to use to identify resources that are to be retained by a tag-level retention rule. See `resourceTags` below.
      */
-    readonly resourceTags: pulumi.Output<outputs.rbin.RuleResourceTag[]>;
+    readonly resourceTags: pulumi.Output<outputs.rbin.RuleResourceTag[] | undefined>;
     /**
-     * The resource type to be retained by the retention rule. Valid values are `EBS_SNAPSHOT` and `EC2_IMAGE`.
+     * Resource type to be retained by the retention rule. Valid values are `EBS_SNAPSHOT` and `EC2_IMAGE`.
      */
     readonly resourceType: pulumi.Output<string>;
     /**
@@ -89,7 +116,7 @@ export declare class Rule extends pulumi.CustomResource {
      */
     readonly retentionPeriod: pulumi.Output<outputs.rbin.RuleRetentionPeriod>;
     /**
-     * (String) The state of the retention rule. Only retention rules that are in the `available` state retain resources. Valid values include `pending` and `available`.
+     * (String) State of the retention rule. Only retention rules that are in the `available` state retain resources. Valid values include `pending` and `available`.
      */
     readonly status: pulumi.Output<string>;
     readonly tags: pulumi.Output<{
@@ -113,19 +140,23 @@ export declare class Rule extends pulumi.CustomResource {
 export interface RuleState {
     arn?: pulumi.Input<string>;
     /**
-     * The retention rule description.
+     * Retention rule description.
      */
     description?: pulumi.Input<string>;
+    /**
+     * Exclusion tags to use to identify resources that are to be excluded, or ignored, by a Region-level retention rule. See `excludeResourceTags` below.
+     */
+    excludeResourceTags?: pulumi.Input<pulumi.Input<inputs.rbin.RuleExcludeResourceTag>[]>;
     /**
      * Information about the retention rule lock configuration. See `lockConfiguration` below.
      */
     lockConfiguration?: pulumi.Input<inputs.rbin.RuleLockConfiguration>;
     /**
-     * (Timestamp) The date and time at which the unlock delay is set to expire. Only returned for retention rules that have been unlocked and that are still within the unlock delay period.
+     * (Timestamp) Date and time at which the unlock delay is set to expire. Only returned for retention rules that have been unlocked and that are still within the unlock delay period.
      */
     lockEndTime?: pulumi.Input<string>;
     /**
-     * (Optional) The lock state of the retention rules to list. Only retention rules with the specified lock state are returned. Valid values are `locked`, `pendingUnlock`, `unlocked`.
+     * (Optional) Lock state of the retention rules to list. Only retention rules with the specified lock state are returned. Valid values are `locked`, `pendingUnlock`, `unlocked`.
      */
     lockState?: pulumi.Input<string>;
     /**
@@ -133,11 +164,11 @@ export interface RuleState {
      */
     region?: pulumi.Input<string>;
     /**
-     * Specifies the resource tags to use to identify resources that are to be retained by a tag-level retention rule. See `resourceTags` below.
+     * Resource tags to use to identify resources that are to be retained by a tag-level retention rule. See `resourceTags` below.
      */
     resourceTags?: pulumi.Input<pulumi.Input<inputs.rbin.RuleResourceTag>[]>;
     /**
-     * The resource type to be retained by the retention rule. Valid values are `EBS_SNAPSHOT` and `EC2_IMAGE`.
+     * Resource type to be retained by the retention rule. Valid values are `EBS_SNAPSHOT` and `EC2_IMAGE`.
      */
     resourceType?: pulumi.Input<string>;
     /**
@@ -147,7 +178,7 @@ export interface RuleState {
      */
     retentionPeriod?: pulumi.Input<inputs.rbin.RuleRetentionPeriod>;
     /**
-     * (String) The state of the retention rule. Only retention rules that are in the `available` state retain resources. Valid values include `pending` and `available`.
+     * (String) State of the retention rule. Only retention rules that are in the `available` state retain resources. Valid values include `pending` and `available`.
      */
     status?: pulumi.Input<string>;
     tags?: pulumi.Input<{
@@ -162,9 +193,13 @@ export interface RuleState {
  */
 export interface RuleArgs {
     /**
-     * The retention rule description.
+     * Retention rule description.
      */
     description?: pulumi.Input<string>;
+    /**
+     * Exclusion tags to use to identify resources that are to be excluded, or ignored, by a Region-level retention rule. See `excludeResourceTags` below.
+     */
+    excludeResourceTags?: pulumi.Input<pulumi.Input<inputs.rbin.RuleExcludeResourceTag>[]>;
     /**
      * Information about the retention rule lock configuration. See `lockConfiguration` below.
      */
@@ -174,11 +209,11 @@ export interface RuleArgs {
      */
     region?: pulumi.Input<string>;
     /**
-     * Specifies the resource tags to use to identify resources that are to be retained by a tag-level retention rule. See `resourceTags` below.
+     * Resource tags to use to identify resources that are to be retained by a tag-level retention rule. See `resourceTags` below.
      */
     resourceTags?: pulumi.Input<pulumi.Input<inputs.rbin.RuleResourceTag>[]>;
     /**
-     * The resource type to be retained by the retention rule. Valid values are `EBS_SNAPSHOT` and `EC2_IMAGE`.
+     * Resource type to be retained by the retention rule. Valid values are `EBS_SNAPSHOT` and `EC2_IMAGE`.
      */
     resourceType: pulumi.Input<string>;
     /**

package/rbin/rule.js

@@ -17,7 +17,7 @@ const utilities = require("../utilities");
  * import * as aws from "@pulumi/aws";
  *
  * const example = new aws.rbin.Rule("example", {
- *     description: "example_rule",
+ *     description: "Example tag-level retention rule",
  *     resourceType: "EBS_SNAPSHOT",
  *     resourceTags: [{
  *         resourceTagKey: "tag_key",
@@ -33,6 +33,29 @@ const utilities = require("../utilities");
  * });
  * ```
  *
+ * ### Region-Level Retention Rule
+ *
+ * ```typescript
+ * import * as pulumi from "@pulumi/pulumi";
+ * import * as aws from "@pulumi/aws";
+ *
+ * const example = new aws.rbin.Rule("example", {
+ *     description: "Example region-level retention rule with exclusion tags",
+ *     resourceType: "EC2_IMAGE",
+ *     excludeResourceTags: [{
+ *         resourceTagKey: "tag_key",
+ *         resourceTagValue: "tag_value",
+ *     }],
+ *     retentionPeriod: {
+ *         retentionPeriodValue: 10,
+ *         retentionPeriodUnit: "DAYS",
+ *     },
+ *     tags: {
+ *         test_tag_key: "test_tag_value",
+ *     },
+ * });
+ * ```
+ *
  * ## Import
  *
  * Using `pulumi import`, import RBin Rule using the `id`. For example:
@@ -71,6 +94,7 @@ class Rule extends pulumi.CustomResource {
             const state = argsOrState;
             resourceInputs["arn"] = state ? state.arn : undefined;
             resourceInputs["description"] = state ? state.description : undefined;
+            resourceInputs["excludeResourceTags"] = state ? state.excludeResourceTags : undefined;
             resourceInputs["lockConfiguration"] = state ? state.lockConfiguration : undefined;
             resourceInputs["lockEndTime"] = state ? state.lockEndTime : undefined;
             resourceInputs["lockState"] = state ? state.lockState : undefined;
@@ -91,6 +115,7 @@ class Rule extends pulumi.CustomResource {
                 throw new Error("Missing required property 'retentionPeriod'");
             }
             resourceInputs["description"] = args ? args.description : undefined;
+            resourceInputs["excludeResourceTags"] = args ? args.excludeResourceTags : undefined;
             resourceInputs["lockConfiguration"] = args ? args.lockConfiguration : undefined;
             resourceInputs["region"] = args ? args.region : undefined;
             resourceInputs["resourceTags"] = args ? args.resourceTags : undefined;

package/rbin/rule.js.map

@@ -1 +1 @@
-{"version":3,"file":"rule.js","sourceRoot":"","sources":["../../rbin/rule.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"rule.js","sourceRoot":"","sources":["../../rbin/rule.ts"],"names":[],"mappings":"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"}

package/route53/getTrafficPolicyDocument.d.ts

@@ -20,12 +20,12 @@ import * as outputs from "../types/output";
  *         {
  *             id: "my_elb",
  *             type: "elastic-load-balancer",
- *             value: `elb-111111.${current.name}.elb.amazonaws.com`,
+ *             value: `elb-111111.${current.region}.elb.amazonaws.com`,
  *         },
  *         {
  *             id: "site_down_banner",
  *             type: "s3-website",
- *             region: current1.name,
+ *             region: current1.region,
  *             value: "www.example.com",
  *         },
  *     ],
@@ -192,12 +192,12 @@ export interface GetTrafficPolicyDocumentResult {
  *         {
  *             id: "my_elb",
  *             type: "elastic-load-balancer",
- *             value: `elb-111111.${current.name}.elb.amazonaws.com`,
+ *             value: `elb-111111.${current.region}.elb.amazonaws.com`,
  *         },
  *         {
  *             id: "site_down_banner",
  *             type: "s3-website",
- *             region: current1.name,
+ *             region: current1.region,
  *             value: "www.example.com",
  *         },
  *     ],

package/route53/getTrafficPolicyDocument.js

@@ -24,12 +24,12 @@ const utilities = require("../utilities");
  *         {
  *             id: "my_elb",
  *             type: "elastic-load-balancer",
- *             value: `elb-111111.${current.name}.elb.amazonaws.com`,
+ *             value: `elb-111111.${current.region}.elb.amazonaws.com`,
  *         },
  *         {
  *             id: "site_down_banner",
  *             type: "s3-website",
- *             region: current1.name,
+ *             region: current1.region,
  *             value: "www.example.com",
  *         },
  *     ],
@@ -160,12 +160,12 @@ exports.getTrafficPolicyDocument = getTrafficPolicyDocument;
  *         {
  *             id: "my_elb",
  *             type: "elastic-load-balancer",
- *             value: `elb-111111.${current.name}.elb.amazonaws.com`,
+ *             value: `elb-111111.${current.region}.elb.amazonaws.com`,
  *         },
  *         {
  *             id: "site_down_banner",
  *             type: "s3-website",
- *             region: current1.name,
+ *             region: current1.region,
  *             value: "www.example.com",
  *         },
  *     ],

package/route53/profilesResourceAssociation.d.ts

@@ -50,7 +50,7 @@ export declare class ProfilesResourceAssociation extends pulumi.CustomResource {
     /**
      * Resource properties for the resource to be associated with the profile.
      */
-    readonly resourceProperties: pulumi.Output<string | undefined>;
+    readonly resourceProperties: pulumi.Output<string>;
     /**
      * Type of resource associated with the profile.
      */

package/s3/bucket.d.ts

@@ -1,6 +1,7 @@
 import * as pulumi from "@pulumi/pulumi";
 import * as inputs from "../types/input";
 import * as outputs from "../types/output";
+import * as enums from "../types/enums";
 /**
  * Provides a S3 bucket resource.
  *
@@ -233,7 +234,7 @@ export interface BucketState {
      *
      * @deprecated acl is deprecated. Use the aws.s3.BucketAcl resource instead.
      */
-    acl?: pulumi.Input<string>;
+    acl?: pulumi.Input<string | enums.s3.CannedAcl>;
     /**
      * ARN of the bucket. Will be of format `arn:aws:s3:::bucketname`.
      */
@@ -311,7 +312,7 @@ export interface BucketState {
      *
      * @deprecated policy is deprecated. Use the aws.s3.BucketPolicy resource instead.
      */
-    policy?: pulumi.Input<string>;
+    policy?: pulumi.Input<string | inputs.s3.PolicyDocument>;
     /**
      * Region where this resource will be [managed](https://docs.aws.amazon.com/general/latest/gr/rande.html#regional-endpoints). Defaults to the Region set in the provider configuration.
      */
@@ -397,7 +398,7 @@ export interface BucketArgs {
      *
      * @deprecated acl is deprecated. Use the aws.s3.BucketAcl resource instead.
      */
-    acl?: pulumi.Input<string>;
+    acl?: pulumi.Input<string | enums.s3.CannedAcl>;
     /**
      * Name of the bucket. If omitted, the provider will assign a random, unique name. Must be lowercase and less than or equal to 63 characters in length. A full list of bucket naming rules [may be found here](https://docs.aws.amazon.com/AmazonS3/latest/userguide/bucketnamingrules.html). The name must not be in the format `[bucketName]--[azid]--x-s3`. Use the `aws.s3.DirectoryBucket` resource to manage S3 Express buckets.
      */
@@ -455,7 +456,7 @@ export interface BucketArgs {
      *
      * @deprecated policy is deprecated. Use the aws.s3.BucketPolicy resource instead.
      */
-    policy?: pulumi.Input<string>;
+    policy?: pulumi.Input<string | inputs.s3.PolicyDocument>;
     /**
      * Region where this resource will be [managed](https://docs.aws.amazon.com/general/latest/gr/rande.html#regional-endpoints). Defaults to the Region set in the provider configuration.
      */

package/s3/bucketPolicy.d.ts

@@ -36,6 +36,8 @@ import * as inputs from "../types/input";
  * });
  * ```
  *
+ * > Only one `aws.s3.BucketPolicy` resource should be defined per S3 bucket. Defining multiple `aws.s3.BucketPolicy` resources with different Pulumi names but the same `bucket` value may result in unexpected policy overwrites. Each resource uses the `PutBucketPolicy` API, which replaces the entire existing policy without error or warning. Because Pulumi treats each resource independently, the policy applied last will silently override any previously applied policy.
+ *
  * ## Import
  *
  * Using `pulumi import`, import S3 bucket policies using the bucket name. For example: