Skip to content

Commit

Permalink
Merge pull request #2114 from pulumi/stack72/v4.28.0
Browse files Browse the repository at this point in the history
  • Loading branch information
@stack72
stack72 authored Aug 26, 2022
2 parents daaa473 + 196747d commit 4d551bd
Show file tree
Hide file tree
Showing 853 changed files with 132,697 additions and 18,193 deletions.
1 change: 0 additions & 1 deletion .gitignore
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@ yarn.lock
**/pulumiManifest.go

ci-scripts
provider/**/schema.go
provider/**/schema-embed.json
**/version.txt
**/nuget
Expand Down
15,977 changes: 13,167 additions & 2,810 deletions provider/cmd/pulumi-resource-aws/schema.json
View file

Large diffs are not rendered by default.

14 changes: 5 additions & 9 deletions provider/go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,14 +7,14 @@ require (
github.com/hashicorp/aws-sdk-go-base/v2 v2.0.0-beta.16
github.com/hashicorp/terraform-provider-aws/shim v0.0.0
github.com/mitchellh/go-homedir v1.1.0
github.com/pulumi/pulumi-terraform-bridge/v3 v3.28.0
github.com/pulumi/pulumi-terraform-bridge/v3 v3.28.1
github.com/pulumi/pulumi/pkg/v3 v3.38.0
github.com/pulumi/pulumi/sdk/v3 v3.38.0
)

replace (
github.com/hashicorp/terraform-plugin-sdk/v2 => github.com/pulumi/terraform-plugin-sdk/v2 v2.0.0-20220725190814-23001ad6ec03
github.com/hashicorp/terraform-provider-aws => github.com/pulumi/terraform-provider-aws v1.38.1-0.20220819101332-19f218509dd2
github.com/hashicorp/terraform-plugin-sdk/v2 => github.com/pulumi/terraform-plugin-sdk/v2 v2.0.0-20220824175045-450992f2f5b9
github.com/hashicorp/terraform-provider-aws => github.com/pulumi/terraform-provider-aws v1.38.1-0.20220826155210-f0b12bc5b5d3
github.com/hashicorp/terraform-provider-aws/shim => ./shim
github.com/hashicorp/vault => github.com/hashicorp/vault v1.2.0
)
Expand Down Expand Up @@ -51,7 +51,7 @@ require (
github.com/apparentlymart/go-cidr v1.1.0 // indirect
github.com/apparentlymart/go-textseg/v13 v13.0.0 // indirect
github.com/armon/go-radix v1.0.0 // indirect
github.com/aws/aws-sdk-go v1.44.77 // indirect
github.com/aws/aws-sdk-go v1.44.84 // indirect
github.com/aws/aws-sdk-go-v2 v1.16.11 // indirect
github.com/aws/aws-sdk-go-v2/config v1.15.4 // indirect
github.com/aws/aws-sdk-go-v2/credentials v1.12.0 // indirect
Expand All @@ -62,7 +62,7 @@ require (
github.com/aws/aws-sdk-go-v2/service/fis v1.12.12 // indirect
github.com/aws/aws-sdk-go-v2/service/iam v1.18.4 // indirect
github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.9.4 // indirect
github.com/aws/aws-sdk-go-v2/service/kendra v1.31.4 // indirect
github.com/aws/aws-sdk-go-v2/service/kendra v1.33.0 // indirect
github.com/aws/aws-sdk-go-v2/service/kms v1.5.0 // indirect
github.com/aws/aws-sdk-go-v2/service/rolesanywhere v1.0.4 // indirect
github.com/aws/aws-sdk-go-v2/service/route53domains v1.12.12 // indirect
Expand Down Expand Up @@ -133,7 +133,6 @@ require (
github.com/hashicorp/terraform-plugin-go v0.14.0 // indirect
github.com/hashicorp/terraform-plugin-log v0.7.0 // indirect
github.com/hashicorp/terraform-plugin-mux v0.7.0 // indirect
github.com/hashicorp/terraform-plugin-sdk v1.7.0 // indirect
github.com/hashicorp/terraform-plugin-sdk/v2 v2.21.0 // indirect
github.com/hashicorp/terraform-provider-aws v1.60.1-0.20211105002759-77bad27d9f23 // indirect
github.com/hashicorp/terraform-registry-address v0.0.0-20220623143253-7d51757b572c // indirect
Expand Down Expand Up @@ -199,8 +198,6 @@ require (
github.com/spf13/cobra v1.4.0 // indirect
github.com/spf13/pflag v1.0.5 // indirect
github.com/stretchr/testify v1.7.2 // indirect
github.com/terraform-providers/terraform-provider-archive v1.3.0 // indirect
github.com/terraform-providers/terraform-provider-http v1.2.0 // indirect
github.com/texttheater/golang-levenshtein v1.0.1 // indirect
github.com/tweekmonster/luser v0.0.0-20161003172636-3fa38070dbd7 // indirect
github.com/uber/jaeger-client-go v2.30.0+incompatible // indirect
Expand All @@ -214,7 +211,6 @@ require (
github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415 // indirect
github.com/xeipuuv/gojsonschema v1.2.0 // indirect
github.com/zclconf/go-cty v1.10.0 // indirect
github.com/zclconf/go-cty-yaml v1.0.1 // indirect
go.opencensus.io v0.23.0 // indirect
go.uber.org/atomic v1.9.0 // indirect
gocloud.dev v0.24.0 // indirect
Expand Down
42 changes: 10 additions & 32 deletions provider/go.sum
View file

Large diffs are not rendered by default.

11 changes: 11 additions & 0 deletions provider/resources.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1525,6 +1525,7 @@ func Provider() tfbridge.ProviderInfo {
"aws_vpc_ipam_preview_next_cidr": {Tok: awsResource(ec2Mod, "VpcIpamPreviewNextCidr")},
"aws_ec2_network_insights_path": {Tok: awsResource(ec2Mod, "NetworkInsightsPath")},
"aws_ec2_serial_console_access": {Tok: awsResource(ec2Mod, "SerialConsoleAccess")},
"aws_ec2_network_insights_analysis": {Tok: awsResource(ec2Mod, "NetworkInsightsAnalysis")},
// EC2 Client VPN
"aws_ec2_client_vpn_endpoint": {Tok: awsResource(ec2ClientVpnMod, "Endpoint")},
"aws_ec2_client_vpn_network_association": {Tok: awsResource(ec2ClientVpnMod, "NetworkAssociation")},
Expand Down Expand Up @@ -1557,6 +1558,8 @@ func Provider() tfbridge.ProviderInfo {
"aws_ec2_transit_gateway_multicast_domain_association": {Tok: awsResource(ec2TransitGatewayMod, "MulticastDomainAssociation")},
"aws_ec2_transit_gateway_multicast_group_member": {Tok: awsResource(ec2TransitGatewayMod, "MulticastGroupMember")},
"aws_ec2_transit_gateway_multicast_group_source": {Tok: awsResource(ec2TransitGatewayMod, "MulticastGroupSource")},
"aws_ec2_transit_gateway_policy_table": {Tok: awsResource(ec2TransitGatewayMod, "PolicyTable")},
"aws_ec2_transit_gateway_policy_table_association": {Tok: awsResource(ec2TransitGatewayMod, "PolicyTableAssociation")},
// Elastic Container Registry
"aws_ecr_repository": {Tok: awsResource(ecrMod, "Repository")},
"aws_ecr_repository_policy": {
Expand Down Expand Up @@ -1830,6 +1833,7 @@ func Provider() tfbridge.ProviderInfo {
"aws_grafana_workspace": {Tok: awsResource(grafanaMod, "Workspace")},
"aws_grafana_workspace_saml_configuration": {Tok: awsResource(grafanaMod, "WorkspaceSamlConfiguration")},
"aws_grafana_role_association": {Tok: awsResource(grafanaMod, "RoleAssociation")},
"aws_grafana_workspace_api_key": {Tok: awsResource(grafanaMod, "WorkspaceApiKey")},
// GuardDuty
"aws_guardduty_detector": {Tok: awsResource(guarddutyMod, "Detector")},
"aws_guardduty_invite_accepter": {Tok: awsResource(guarddutyMod, "InviteAccepter")},
Expand Down Expand Up @@ -2307,6 +2311,8 @@ func Provider() tfbridge.ProviderInfo {
"aws_networkmanager_transit_gateway_registration": {Tok: awsResource(networkManagerMod, "TransitGatewayRegistration")},
"aws_networkmanager_attachment_accepter": {Tok: awsResource(networkManagerMod, "AttachmentAccepter")},
"aws_networkmanager_vpc_attachment": {Tok: awsResource(networkManagerMod, "VpcAttachment")},
"aws_networkmanager_transit_gateway_peering": {Tok: awsResource(networkManagerMod, "TransitGatewayPeering")},
"aws_networkmanager_transit_gateway_route_table_attachment": {Tok: awsResource(networkManagerMod, "TransitGatewayRouteTableAttachment")},
// OpenSearch
"aws_opensearch_domain": {
Tok: awsResource(opensearchMod, "Domain"),
Expand Down Expand Up @@ -2517,6 +2523,7 @@ func Provider() tfbridge.ProviderInfo {
"aws_redshiftdata_statement": {Tok: awsResource(redshiftDataMod, "Statement")},
// Redshift serverless
"aws_redshiftserverless_namespace": {Tok: awsResource(redshiftServerlessMod, "Namespace")},
"aws_redshiftserverless_workgroup": {Tok: awsResource(redshiftServerlessMod, "Workgroup")},
// Resource Groups
"aws_resourcegroups_group": {Tok: awsResource(resourcegroupsMod, "Group")},
// Roles Anywhere
Expand Down Expand Up @@ -4716,6 +4723,8 @@ func Provider() tfbridge.ProviderInfo {
"aws_vpc_ipam_preview_next_cidr": {Tok: awsDataSource(ec2Mod, "getIpamPreviewNextCidr")},
"aws_eips": {Tok: awsDataSource(ec2Mod, "getEips")},
"aws_ec2_serial_console_access": {Tok: awsDataSource(ec2Mod, "getSerialConsoleAccess")},
"aws_ec2_network_insights_analysis": {Tok: awsDataSource(ec2Mod, "getNetworkInsightsAnalysis")},
"aws_ec2_network_insights_path": {Tok: awsDataSource(ec2Mod, "getNetworkInsightsPath")},

// Ec2 Client
"aws_ec2_client_vpn_endpoint": {Tok: awsDataSource(ec2ClientVpnMod, "getEndpoint")},
Expand All @@ -4735,6 +4744,7 @@ func Provider() tfbridge.ProviderInfo {
"aws_ec2_transit_gateway_peering_attachment": {
Tok: awsDataSource(ec2TransitGatewayMod, "getPeeringAttachment"),
},
"aws_ec2_transit_gateway_attachment": {Tok: awsDataSource(ec2TransitGatewayMod, "getAttachment")},
// Elastic Beanstalk
"aws_elastic_beanstalk_application": {
Tok: awsDataSource(elasticbeanstalkMod, "getApplication"),
Expand Down Expand Up @@ -4925,6 +4935,7 @@ func Provider() tfbridge.ProviderInfo {
"aws_location_route_calculator": {Tok: awsDataSource(locationMod, "getRouteCalculator")},
"aws_location_tracker": {Tok: awsDataSource(locationMod, "getTracker")},
"aws_location_geofence_collection": {Tok: awsDataSource(locationMod, "getGeofenceCollection")},
"aws_location_tracker_association": {Tok: awsDataSource(locationMod, "getTrackerAssociation")},

// Pricing
"aws_pricing_product": {Tok: awsDataSource(pricingMod, "getProduct")},
Expand Down
6 changes: 3 additions & 3 deletions provider/shim/go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,13 @@ require (
github.com/hashicorp/terraform-provider-aws v1.60.1-0.20211105002759-77bad27d9f23
)

replace github.com/hashicorp/terraform-provider-aws => github.com/pulumi/terraform-provider-aws v1.38.1-0.20220819101332-19f218509dd2
replace github.com/hashicorp/terraform-provider-aws => github.com/pulumi/terraform-provider-aws v1.38.1-0.20220826155210-f0b12bc5b5d3

require (
github.com/ProtonMail/go-crypto v0.0.0-20210428141323-04723f9f07d7 // indirect
github.com/agext/levenshtein v1.2.2 // indirect
github.com/apparentlymart/go-textseg/v13 v13.0.0 // indirect
github.com/aws/aws-sdk-go v1.44.77 // indirect
github.com/aws/aws-sdk-go v1.44.84 // indirect
github.com/aws/aws-sdk-go-v2 v1.16.11 // indirect
github.com/aws/aws-sdk-go-v2/config v1.15.4 // indirect
github.com/aws/aws-sdk-go-v2/credentials v1.12.0 // indirect
Expand All @@ -25,7 +25,7 @@ require (
github.com/aws/aws-sdk-go-v2/service/fis v1.12.12 // indirect
github.com/aws/aws-sdk-go-v2/service/iam v1.18.4 // indirect
github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.9.4 // indirect
github.com/aws/aws-sdk-go-v2/service/kendra v1.31.4 // indirect
github.com/aws/aws-sdk-go-v2/service/kendra v1.33.0 // indirect
github.com/aws/aws-sdk-go-v2/service/rolesanywhere v1.0.4 // indirect
github.com/aws/aws-sdk-go-v2/service/route53domains v1.12.12 // indirect
github.com/aws/aws-sdk-go-v2/service/sso v1.11.4 // indirect
Expand Down
12 changes: 6 additions & 6 deletions provider/shim/go.sum
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@ github.com/apparentlymart/go-textseg/v13 v13.0.0 h1:Y+KvPE1NYz0xl601PVImeQfFyEy6
github.com/apparentlymart/go-textseg/v13 v13.0.0/go.mod h1:ZK2fH7c4NqDTLtiYLvIkEghdlcqw7yxLeM89kiTRPUo=
github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5/go.mod h1:wHh0iHkYZB8zMSxRWpUBQtwG5a7fFgvEO+odwuTv2gs=
github.com/aws/aws-sdk-go v1.31.9/go.mod h1:5zCpMtNQVjRREroY7sYe8lOMRSxkhG6MZveU8YkpAk0=
github.com/aws/aws-sdk-go v1.44.77 h1:m5rTfdv04/swD+vTuS2zn4NEwKX3yEJPMhiVCFDL/mU=
github.com/aws/aws-sdk-go v1.44.77/go.mod h1:y4AeaBuwd2Lk+GepC1E9v0qOiTws0MIWAX4oIKwKHZo=
github.com/aws/aws-sdk-go v1.44.84 h1:orGogGRrizQSqn3lBnaP/FQIcjPMLf9azDO0h+oTJr0=
github.com/aws/aws-sdk-go v1.44.84/go.mod h1:y4AeaBuwd2Lk+GepC1E9v0qOiTws0MIWAX4oIKwKHZo=
github.com/aws/aws-sdk-go-v2 v1.16.3/go.mod h1:ytwTPBG6fXTZLxxeeCCWj2/EMYp/xDUgX+OET6TLNNU=
github.com/aws/aws-sdk-go-v2 v1.16.11 h1:xM1ZPSvty3xVmdxiGr7ay/wlqv+MWhH0rMlyLdbC0YQ=
github.com/aws/aws-sdk-go-v2 v1.16.11/go.mod h1:WTACcleLz6VZTp7fak4EO5b9Q4foxbn+8PIz3PmyKlo=
Expand All @@ -48,8 +48,8 @@ github.com/aws/aws-sdk-go-v2/service/iam v1.18.4 h1:E41guA79mjEbwJdh0zXz1d8+Zt4z
github.com/aws/aws-sdk-go-v2/service/iam v1.18.4/go.mod h1:FpNvAfCZyIQ3qeNJUOw4CShKvdizHblXqAvSk0qmyL4=
github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.9.4 h1:b16QW0XWl0jWjLABFc1A+uh145Oqv+xDcObNk0iQgUk=
github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.9.4/go.mod h1:uKkN7qmSIsNJVyMtxNQoCEYMvFEXbOg9fwCJPdfp2u8=
github.com/aws/aws-sdk-go-v2/service/kendra v1.31.4 h1:ZNjiM0sJgH/Oyx/AxbwcLSWbNaKvquPHhiLkkFgjEiU=
github.com/aws/aws-sdk-go-v2/service/kendra v1.31.4/go.mod h1:irFuMCMcRyO8Y+Uy9TajvrH/KJaRLT+jLJ5kCxNBySY=
github.com/aws/aws-sdk-go-v2/service/kendra v1.33.0 h1:4wnNpNlkUwrPKEzbm14pjLCOxiXg9qhjfzhkXyggij8=
github.com/aws/aws-sdk-go-v2/service/kendra v1.33.0/go.mod h1:irFuMCMcRyO8Y+Uy9TajvrH/KJaRLT+jLJ5kCxNBySY=
github.com/aws/aws-sdk-go-v2/service/rolesanywhere v1.0.4 h1:6FvtutMp7h3EAk2kjcLii+w9UYyvUdNAIVUG0jnbMs8=
github.com/aws/aws-sdk-go-v2/service/rolesanywhere v1.0.4/go.mod h1:C9xxUK4FnxA9sTmpR6KeHkKLkG8/x/piCa2bffnfJ9E=
github.com/aws/aws-sdk-go-v2/service/route53domains v1.12.12 h1:L+36zTEzmXHEyRiPJVKbx4Lx0E3cSnB/813Hv2iZqJU=
Expand Down Expand Up @@ -250,8 +250,8 @@ github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZb
github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
github.com/pquerna/otp v1.3.0 h1:oJV/SkzR33anKXwQU3Of42rL4wbrffP4uvUf1SvS5Xs=
github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=
github.com/pulumi/terraform-provider-aws v1.38.1-0.20220819101332-19f218509dd2 h1:fhOn65OqtpVzNnCxZuOQVJxIvj6xjnhroINnV3MWwYI=
github.com/pulumi/terraform-provider-aws v1.38.1-0.20220819101332-19f218509dd2/go.mod h1:bjqRpLHvQtuawrn5BFmETVpttq+DBaLoZUDW+Qn9GxA=
github.com/pulumi/terraform-provider-aws v1.38.1-0.20220826155210-f0b12bc5b5d3 h1:/BQbBJcH8A+lkxCY1qdRZ6bO1Rf124xp/r8TkySwzvo=
github.com/pulumi/terraform-provider-aws v1.38.1-0.20220826155210-f0b12bc5b5d3/go.mod h1:IEu2uTZm27/EZ8rrgv/Twmd9TyfK+tqprVuSGKGvVbU=
github.com/rogpeppe/fastuuid v1.2.0/go.mod h1:jVj6XXZzXRy/MSR5jhDC/2q6DgLz+nrA6LYCDYWNEvQ=
github.com/sebdah/goldie v1.0.0/go.mod h1:jXP4hmWywNEwZzhMuv2ccnqTSFpuq8iyQhtQdkkZBH4=
github.com/sergi/go-diff v1.1.0/go.mod h1:STckp+ISIX8hZLjrqAeVduY0gWCT9IjLuqbuNXdaHfM=
Expand Down
41 changes: 41 additions & 0 deletions sdk/dotnet/AccessAnalyzer/ArchiveRule.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,47 @@ namespace Pulumi.Aws.AccessAnalyzer
{
/// <summary>
/// ## Example Usage
/// ### Basic Usage
///
/// ```csharp
/// using System.Collections.Generic;
/// using Pulumi;
/// using Aws = Pulumi.Aws;
///
/// return await Deployment.RunAsync(() =&gt;
/// {
/// var example = new Aws.AccessAnalyzer.ArchiveRule("example", new()
/// {
/// AnalyzerName = "example-analyzer",
/// Filters = new[]
/// {
/// new Aws.AccessAnalyzer.Inputs.ArchiveRuleFilterArgs
/// {
/// Criteria = "condition.aws:UserId",
/// Eqs = new[]
/// {
/// "userid",
/// },
/// },
/// new Aws.AccessAnalyzer.Inputs.ArchiveRuleFilterArgs
/// {
/// Criteria = "error",
/// Exists = "true",
/// },
/// new Aws.AccessAnalyzer.Inputs.ArchiveRuleFilterArgs
/// {
/// Criteria = "isPublic",
/// Eqs = new[]
/// {
/// "false",
/// },
/// },
/// },
/// RuleName = "example-rule",
/// });
///
/// });
/// ```
///
/// ## Import
///
Expand Down
Loading

0 comments on commit 4d551bd

Please sign in to comment.