Skip to content

Commit

Permalink
Upgrade terraform-provider-google-beta to v4.75.0 (#1136)
Browse files Browse the repository at this point in the history 
* make tfgen

* make build_sdks
  • Loading branch information
@aq17
aq17 authored Jul 25, 2023
1 parent dfacd8a commit 8e60df9
Show file tree
Hide file tree
Showing 260 changed files with 20,542 additions and 602 deletions.
156 changes: 155 additions & 1 deletion provider/cmd/pulumi-resource-gcp/bridge-metadata.json
View file

Large diffs are not rendered by default.

733 changes: 696 additions & 37 deletions provider/cmd/pulumi-resource-gcp/schema.json
View file

Large diffs are not rendered by default.

10 changes: 5 additions & 5 deletions provider/go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ go 1.19
require (
github.com/hashicorp/terraform-provider-google-beta v0.0.0
github.com/pulumi/pulumi-terraform-bridge/pf v0.14.0
github.com/pulumi/pulumi-terraform-bridge/v3 v3.54.0
github.com/pulumi/pulumi-terraform-bridge/v3 v3.54.1
github.com/pulumi/pulumi/pkg/v3 v3.75.0
github.com/pulumi/pulumi/sdk/v3 v3.75.0
)
Expand All @@ -18,14 +18,14 @@ replace (

require (
bitbucket.org/creachadair/stringset v0.0.8 // indirect
cloud.google.com/go v0.110.0 // indirect
cloud.google.com/go/bigtable v1.17.0 // indirect
cloud.google.com/go v0.110.2 // indirect
cloud.google.com/go/bigtable v1.19.0 // indirect
cloud.google.com/go/compute v1.19.3 // indirect
cloud.google.com/go/compute/metadata v0.2.3 // indirect
cloud.google.com/go/iam v0.13.0 // indirect
cloud.google.com/go/iam v1.1.0 // indirect
cloud.google.com/go/kms v1.10.1 // indirect
cloud.google.com/go/logging v1.7.0 // indirect
cloud.google.com/go/longrunning v0.4.1 // indirect
cloud.google.com/go/longrunning v0.5.0 // indirect
cloud.google.com/go/storage v1.29.0 // indirect
github.com/AlecAivazis/survey/v2 v2.0.5 // indirect
github.com/Azure/azure-sdk-for-go v66.0.0+incompatible // indirect
Expand Down
17 changes: 10 additions & 7 deletions provider/go.sum
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,8 +41,9 @@ cloud.google.com/go v0.103.0/go.mod h1:vwLx1nqLrzLX/fpwSMOXmFIqBOyHsvHbnAdbGSJ+m
cloud.google.com/go v0.104.0/go.mod h1:OO6xxXdJyvuJPcEPBLN9BJPD+jep5G1+2U5B5gkRYtA=
cloud.google.com/go v0.105.0/go.mod h1:PrLgOJNe5nfE9UMxKxgXj4mD3voiP+YQ6gdt6KMFOKM=
cloud.google.com/go v0.107.0/go.mod h1:wpc2eNrD7hXUTy8EKS10jkxpZBjASrORK7goS+3YX2I=
cloud.google.com/go v0.110.0 h1:Zc8gqp3+a9/Eyph2KDmcGaPtbKRIoqq4YTlL4NMD0Ys=
cloud.google.com/go v0.110.0/go.mod h1:SJnCLqQ0FCFGSZMUNUf84MV3Aia54kn7pi8st7tMzaY=
cloud.google.com/go v0.110.2 h1:sdFPBr6xG9/wkBbfhmUz/JmZC7X6LavQgcrVINrKiVA=
cloud.google.com/go v0.110.2/go.mod h1:k04UEeEtb6ZBRTv3dZz4CeJC3jKGxyhl0sAiVVquxiw=
cloud.google.com/go/accessapproval v1.4.0/go.mod h1:zybIuC3KpDOvotz59lFe5qxRZx6C75OtwbisN56xYB4=
cloud.google.com/go/accessapproval v1.5.0/go.mod h1:HFy3tuiGvMdcd/u+Cu5b9NkO1pEICJ46IR82PoUdplw=
cloud.google.com/go/accessapproval v1.6.0/go.mod h1:R0EiYnwV5fsRFiKZkPHr6mwyk2wxUJ30nL4j2pcFY2E=
Expand Down Expand Up @@ -132,8 +133,8 @@ cloud.google.com/go/bigquery v1.47.0/go.mod h1:sA9XOgy0A8vQK9+MWhEQTY6Tix87M/Zur
cloud.google.com/go/bigquery v1.48.0/go.mod h1:QAwSz+ipNgfL5jxiaK7weyOhzdoAy1zFm0Nf1fysJac=
cloud.google.com/go/bigquery v1.49.0/go.mod h1:Sv8hMmTFFYBlt/ftw2uN6dFdQPzBlREY9yBh7Oy7/4Q=
cloud.google.com/go/bigquery v1.50.0/go.mod h1:YrleYEh2pSEbgTBZYMJ5SuSr0ML3ypjRB1zgf7pvQLU=
cloud.google.com/go/bigtable v1.17.0 h1:8t48YTxxFsYKy+AWuHdoePgAr4J2gEtntbdWclbEbco=
cloud.google.com/go/bigtable v1.17.0/go.mod h1:wtf7lFV1Wa5ay6aKa/gv/T2Ci7J6qXpBX8Ofij2z5mo=
cloud.google.com/go/bigtable v1.19.0 h1:wiq9LT0kukfInzvy1joMDijCw/OD1UChpSbORXYn0LI=
cloud.google.com/go/bigtable v1.19.0/go.mod h1:xl5kPa8PTkJjdBxg6qdGH88464nNqmbISHSRU+D2yFE=
cloud.google.com/go/billing v1.4.0/go.mod h1:g9IdKBEFlItS8bTtlrZdVLWSSdSyFUZKXNS02zKMOZY=
cloud.google.com/go/billing v1.5.0/go.mod h1:mztb1tBc3QekhjSgmpf/CV4LzWXLzCArwpLmP2Gm88s=
cloud.google.com/go/billing v1.6.0/go.mod h1:WoXzguj+BeHXPbKfNWkqVtDdzORazmCjraY+vrxcyvI=
Expand Down Expand Up @@ -322,8 +323,9 @@ cloud.google.com/go/iam v0.7.0/go.mod h1:H5Br8wRaDGNc8XP3keLc4unfUUZeyH3Sfl9XpQE
cloud.google.com/go/iam v0.8.0/go.mod h1:lga0/y3iH6CX7sYqypWJ33hf7kkfXJag67naqGESjkE=
cloud.google.com/go/iam v0.11.0/go.mod h1:9PiLDanza5D+oWFZiH1uG+RnRCfEGKoyl6yo4cgWZGY=
cloud.google.com/go/iam v0.12.0/go.mod h1:knyHGviacl11zrtZUoDuYpDgLjvr28sLQaG0YB2GYAY=
cloud.google.com/go/iam v0.13.0 h1:+CmB+K0J/33d0zSQ9SlFWUeCCEn5XJA0ZMZ3pHE9u8k=
cloud.google.com/go/iam v0.13.0/go.mod h1:ljOg+rcNfzZ5d6f1nAUJ8ZIxOaZUVoS14bKCtaLZ/D0=
cloud.google.com/go/iam v1.1.0 h1:67gSqaPukx7O8WLLHMa0PNs3EBGd2eE4d+psbO/CO94=
cloud.google.com/go/iam v1.1.0/go.mod h1:nxdHjaKfCr7fNYx/HJMM8LgiMugmveWlkatear5gVyk=
cloud.google.com/go/iap v1.4.0/go.mod h1:RGFwRJdihTINIe4wZ2iCP0zF/qu18ZwyKxrhMhygBEc=
cloud.google.com/go/iap v1.5.0/go.mod h1:UH/CGgKd4KyohZL5Pt0jSKE4m3FR51qg6FKQ/z/Ix9A=
cloud.google.com/go/iap v1.6.0/go.mod h1:NSuvI9C/j7UdjGjIde7t7HBz+QTwBcapPE07+sSRcLk=
Expand Down Expand Up @@ -357,8 +359,9 @@ cloud.google.com/go/logging v1.7.0 h1:CJYxlNNNNAMkHp9em/YEXcfJg+rPDg7YfwoRpMU+t5
cloud.google.com/go/logging v1.7.0/go.mod h1:3xjP2CjkM3ZkO73aj4ASA5wRPGGCRrPIAeNqVNkzY8M=
cloud.google.com/go/longrunning v0.1.1/go.mod h1:UUFxuDWkv22EuY93jjmDMFT5GPQKeFVJBIF6QlTqdsE=
cloud.google.com/go/longrunning v0.3.0/go.mod h1:qth9Y41RRSUE69rDcOn6DdK3HfQfsUI0YSmW3iIlLJc=
cloud.google.com/go/longrunning v0.4.1 h1:v+yFJOfKC3yZdY6ZUI933pIYdhyhV8S3NpWrXWmg7jM=
cloud.google.com/go/longrunning v0.4.1/go.mod h1:4iWDqhBZ70CvZ6BfETbvam3T8FMvLK+eFj0E6AaRQTo=
cloud.google.com/go/longrunning v0.5.0 h1:DK8BH0+hS+DIvc9a2TPnteUievsTCH4ORMAASSb7JcQ=
cloud.google.com/go/longrunning v0.5.0/go.mod h1:0JNuqRShmscVAhIACGtskSAWtqtOoPkwP0YF1oVEchc=
cloud.google.com/go/managedidentities v1.3.0/go.mod h1:UzlW3cBOiPrzucO5qWkNkh0w33KFtBJU281hacNvsdE=
cloud.google.com/go/managedidentities v1.4.0/go.mod h1:NWSBYbEMgqmbZsLIyKvxrYbtqOsxY1ZrGM+9RgDqInM=
cloud.google.com/go/managedidentities v1.5.0/go.mod h1:+dWcZ0JlUmpuxpIDfyP5pP5y0bLdRwOS4Lp7gMni/LA=
Expand Down Expand Up @@ -2162,8 +2165,8 @@ github.com/pulumi/pulumi-java/pkg v0.9.4/go.mod h1:c6rSw/+q4O0IImgJ9axxoC6QesbPY
github.com/pulumi/pulumi-terraform-bridge/pf v0.14.0 h1:E6CguD/iCfeJYH7EMA40l7rbisJV6QvBIPo6kss57N0=
github.com/pulumi/pulumi-terraform-bridge/pf v0.14.0/go.mod h1:JnLxW6/U/BGCVdOqsPtPxnIumHp26wqsZv3Ywtgbdl8=
github.com/pulumi/pulumi-terraform-bridge/testing v0.0.1 h1:SCg1gjfY9N4yn8U8peIUYATifjoDABkyR7H9lmefsfc=
github.com/pulumi/pulumi-terraform-bridge/v3 v3.54.0 h1:xp0lE7r3O7lD7lVjJ8KhDL0sNYDCDHippxWUR6sXQx0=
github.com/pulumi/pulumi-terraform-bridge/v3 v3.54.0/go.mod h1:OgOp9PzeKBBqWRZ87VX+amwG8Jt1V1pI+/WZ5dGkYG8=
github.com/pulumi/pulumi-terraform-bridge/v3 v3.54.1 h1:vTu0+el9A3AH9klQKdxloOCuvLONHZPDVFDC6cFor+g=
github.com/pulumi/pulumi-terraform-bridge/v3 v3.54.1/go.mod h1:OgOp9PzeKBBqWRZ87VX+amwG8Jt1V1pI+/WZ5dGkYG8=
github.com/pulumi/pulumi-terraform-bridge/x/muxer v0.0.4 h1:rIzMmtcVpPX8ynaz6/nW5AHNY63DiNfCohqmxWvMpM4=
github.com/pulumi/pulumi-terraform-bridge/x/muxer v0.0.4/go.mod h1:Kt8RIZWa/N8rW3+0g6NrqCBmF3o+HuIhFaZpssEkG6w=
github.com/pulumi/pulumi-yaml v1.1.1 h1:8pyBNIU8+ym0wYpjhsCqN+cutygfK1XbhY2YEeNfyXY=
Expand Down
2 changes: 2 additions & 0 deletions provider/resources.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -101,6 +101,7 @@ const (
gcpKMS = "Kms" // KMS resources
gcpKubernetes = "Container" // Kubernetes Engine resources
gcpLogging = "Logging" // Logging resources
gcpLooker = "Looker" // Looker resources
gcpMachingLearning = "ML" // Machine Learning
gcpMemcache = "Memcache" // Memcache resources
gcpMonitoring = "Monitoring" // Monitoring resources
Expand Down Expand Up @@ -199,6 +200,7 @@ var moduleMapping = map[string]string{
"healthcare": gcpHealthcare,
"iam": gcpIAM,
"iap": gcpIAP,
"looker": gcpLooker,
"identity_platform": gcpIdentityPlatform,
"cloudiot": gcpIot,
"kms": gcpKMS,
Expand Down
72 changes: 65 additions & 7 deletions sdk/dotnet/Alloydb/Cluster.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,22 +33,80 @@ namespace Pulumi.Gcp.Alloydb
///
/// return await Deployment.RunAsync(() =>
/// {
/// var project = Gcp.Organizations.GetProject.Invoke();
///
/// var defaultNetwork = new Gcp.Compute.Network("defaultNetwork");
///
/// var defaultCluster = new Gcp.Alloydb.Cluster("defaultCluster", new()
/// {
/// ClusterId = "alloydb-cluster",
/// Location = "us-central1",
/// Network = Output.Tuple(project, defaultNetwork.Name).Apply(values =>
/// Network = defaultNetwork.Id,
/// });
///
/// var project = Gcp.Organizations.GetProject.Invoke();
///
/// });
/// ```
/// ### Alloydb Cluster Full
///
/// ```csharp
/// using System.Collections.Generic;
/// using System.Linq;
/// using Pulumi;
/// using Gcp = Pulumi.Gcp;
///
/// return await Deployment.RunAsync(() =>
/// {
/// var @default = new Gcp.Compute.Network("default");
///
/// var full = new Gcp.Alloydb.Cluster("full", new()
/// {
/// ClusterId = "alloydb-cluster-full",
/// Location = "us-central1",
/// Network = @default.Id,
/// InitialUser = new Gcp.Alloydb.Inputs.ClusterInitialUserArgs
/// {
/// User = "alloydb-cluster-full",
/// Password = "alloydb-cluster-full",
/// },
/// AutomatedBackupPolicy = new Gcp.Alloydb.Inputs.ClusterAutomatedBackupPolicyArgs
/// {
/// var project = values.Item1;
/// var name = values.Item2;
/// return $"projects/{project.Apply(getProjectResult => getProjectResult.Number)}/global/networks/{name}";
/// }),
/// Location = "us-central1",
/// BackupWindow = "1800s",
/// Enabled = true,
/// WeeklySchedule = new Gcp.Alloydb.Inputs.ClusterAutomatedBackupPolicyWeeklyScheduleArgs
/// {
/// DaysOfWeeks = new[]
/// {
/// "MONDAY",
/// },
/// StartTimes = new[]
/// {
/// new Gcp.Alloydb.Inputs.ClusterAutomatedBackupPolicyWeeklyScheduleStartTimeArgs
/// {
/// Hours = 23,
/// Minutes = 0,
/// Seconds = 0,
/// Nanos = 0,
/// },
/// },
/// },
/// QuantityBasedRetention = new Gcp.Alloydb.Inputs.ClusterAutomatedBackupPolicyQuantityBasedRetentionArgs
/// {
/// Count = 1,
/// },
/// Labels =
/// {
/// { "test", "alloydb-cluster-full" },
/// },
/// },
/// Labels =
/// {
/// { "test", "alloydb-cluster-full" },
/// },
/// });
///
/// var project = Gcp.Organizations.GetProject.Invoke();
///
/// });
/// ```
///
Expand Down
11 changes: 3 additions & 8 deletions sdk/dotnet/Alloydb/Instance.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,20 +29,13 @@ namespace Pulumi.Gcp.Alloydb
///
/// return await Deployment.RunAsync(() =>
/// {
/// var project = Gcp.Organizations.GetProject.Invoke();
///
/// var defaultNetwork = new Gcp.Compute.Network("defaultNetwork");
///
/// var defaultCluster = new Gcp.Alloydb.Cluster("defaultCluster", new()
/// {
/// ClusterId = "alloydb-cluster",
/// Location = "us-central1",
/// Network = Output.Tuple(project, defaultNetwork.Name).Apply(values =>
/// {
/// var project = values.Item1;
/// var name = values.Item2;
/// return $"projects/{project.Apply(getProjectResult => getProjectResult.Number)}/global/networks/{name}";
/// }),
/// Network = defaultNetwork.Id,
/// InitialUser = new Gcp.Alloydb.Inputs.ClusterInitialUserArgs
/// {
/// Password = "alloydb-cluster",
Expand Down Expand Up @@ -84,6 +77,8 @@ namespace Pulumi.Gcp.Alloydb
/// },
/// });
///
/// var project = Gcp.Organizations.GetProject.Invoke();
///
/// });
/// ```
///
Expand Down
111 changes: 111 additions & 0 deletions sdk/dotnet/Apigee/Organization.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,28 @@ namespace Pulumi.Gcp.Apigee
///
/// });
/// ```
/// ### Apigee Organization Cloud Basic Disable Vpc Peering
///
/// ```csharp
/// using System.Collections.Generic;
/// using System.Linq;
/// using Pulumi;
/// using Gcp = Pulumi.Gcp;
///
/// return await Deployment.RunAsync(() =>
/// {
/// var current = Gcp.Organizations.GetClientConfig.Invoke();
///
/// var org = new Gcp.Apigee.Organization("org", new()
/// {
/// Description = "Terraform-provisioned basic Apigee Org without VPC Peering.",
/// AnalyticsRegion = "us-central1",
/// ProjectId = current.Apply(getClientConfigResult => getClientConfigResult.Project),
/// DisableVpcPeering = true,
/// });
///
/// });
/// ```
/// ### Apigee Organization Cloud Full
///
/// ```csharp
Expand Down Expand Up @@ -146,6 +168,65 @@ namespace Pulumi.Gcp.Apigee
///
/// });
/// ```
/// ### Apigee Organization Cloud Full Disable Vpc Peering
///
/// ```csharp
/// using System.Collections.Generic;
/// using System.Linq;
/// using Pulumi;
/// using Gcp = Pulumi.Gcp;
///
/// return await Deployment.RunAsync(() =>
/// {
/// var current = Gcp.Organizations.GetClientConfig.Invoke();
///
/// var apigeeKeyring = new Gcp.Kms.KeyRing("apigeeKeyring", new()
/// {
/// Location = "us-central1",
/// });
///
/// var apigeeKey = new Gcp.Kms.CryptoKey("apigeeKey", new()
/// {
/// KeyRing = apigeeKeyring.Id,
/// });
///
/// var apigeeSa = new Gcp.Projects.ServiceIdentity("apigeeSa", new()
/// {
/// Project = google_project.Project.Project_id,
/// Service = google_project_service.Apigee.Service,
/// }, new CustomResourceOptions
/// {
/// Provider = google_beta,
/// });
///
/// var apigeeSaKeyuser = new Gcp.Kms.CryptoKeyIAMBinding("apigeeSaKeyuser", new()
/// {
/// CryptoKeyId = apigeeKey.Id,
/// Role = "roles/cloudkms.cryptoKeyEncrypterDecrypter",
/// Members = new[]
/// {
/// apigeeSa.Email.Apply(email => $"serviceAccount:{email}"),
/// },
/// });
///
/// var org = new Gcp.Apigee.Organization("org", new()
/// {
/// AnalyticsRegion = "us-central1",
/// DisplayName = "apigee-org",
/// Description = "Terraform-provisioned Apigee Org without VPC Peering.",
/// ProjectId = current.Apply(getClientConfigResult => getClientConfigResult.Project),
/// DisableVpcPeering = true,
/// RuntimeDatabaseEncryptionKeyName = apigeeKey.Id,
/// }, new CustomResourceOptions
/// {
/// DependsOn = new[]
/// {
/// apigeeSaKeyuser,
/// },
/// });
///
/// });
/// ```
///
/// ## Import
///
Expand Down Expand Up @@ -201,6 +282,16 @@ public partial class Organization : global::Pulumi.CustomResource
[Output("description")]
public Output<string?> Description { get; private set; } = null!;

/// <summary>
/// Flag that specifies whether the VPC Peering through Private Google Access should be
/// disabled between the consumer network and Apigee. Required if an `authorizedNetwork`
/// on the consumer project is not provided, in which case the flag should be set to `true`.
/// Valid only when `RuntimeType` is set to CLOUD. The value must be set before the creation
/// of any Apigee runtime instance and can be updated only when there are no runtime instances.
/// </summary>
[Output("disableVpcPeering")]
public Output<bool?> DisableVpcPeering { get; private set; } = null!;

/// <summary>
/// The display name of the Apigee organization.
/// </summary>
Expand Down Expand Up @@ -336,6 +427,16 @@ public sealed class OrganizationArgs : global::Pulumi.ResourceArgs
[Input("description")]
public Input<string>? Description { get; set; }

/// <summary>
/// Flag that specifies whether the VPC Peering through Private Google Access should be
/// disabled between the consumer network and Apigee. Required if an `authorizedNetwork`
/// on the consumer project is not provided, in which case the flag should be set to `true`.
/// Valid only when `RuntimeType` is set to CLOUD. The value must be set before the creation
/// of any Apigee runtime instance and can be updated only when there are no runtime instances.
/// </summary>
[Input("disableVpcPeering")]
public Input<bool>? DisableVpcPeering { get; set; }

/// <summary>
/// The display name of the Apigee organization.
/// </summary>
Expand Down Expand Up @@ -433,6 +534,16 @@ public sealed class OrganizationState : global::Pulumi.ResourceArgs
[Input("description")]
public Input<string>? Description { get; set; }

/// <summary>
/// Flag that specifies whether the VPC Peering through Private Google Access should be
/// disabled between the consumer network and Apigee. Required if an `authorizedNetwork`
/// on the consumer project is not provided, in which case the flag should be set to `true`.
/// Valid only when `RuntimeType` is set to CLOUD. The value must be set before the creation
/// of any Apigee runtime instance and can be updated only when there are no runtime instances.
/// </summary>
[Input("disableVpcPeering")]
public Input<bool>? DisableVpcPeering { get; set; }

/// <summary>
/// The display name of the Apigee organization.
/// </summary>
Expand Down
14 changes: 14 additions & 0 deletions sdk/dotnet/BigQuery/Inputs/TableExternalDataConfigurationArgs.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,13 @@ public sealed class TableExternalDataConfigurationArgs : global::Pulumi.Resource
[Input("ignoreUnknownValues")]
public Input<bool>? IgnoreUnknownValues { get; set; }

/// <summary>
/// Additional properties to set if
/// `source_format` is set to "JSON". Structure is documented below.
/// </summary>
[Input("jsonOptions")]
public Input<Inputs.TableExternalDataConfigurationJsonOptionsArgs>? JsonOptions { get; set; }

/// <summary>
/// The maximum number of bad records that
/// BigQuery can ignore when reading data.
Expand All @@ -96,6 +103,13 @@ public sealed class TableExternalDataConfigurationArgs : global::Pulumi.Resource
[Input("objectMetadata")]
public Input<string>? ObjectMetadata { get; set; }

/// <summary>
/// Additional properties to set if
/// `source_format` is set to "PARQUET". Structure is documented below.
/// </summary>
[Input("parquetOptions")]
public Input<Inputs.TableExternalDataConfigurationParquetOptionsArgs>? ParquetOptions { get; set; }

/// <summary>
/// When creating an external table, the user can provide a reference file with the table schema. This is enabled for the following formats: AVRO, PARQUET, ORC.
/// </summary>
Expand Down
Loading

0 comments on commit 8e60df9

Please sign in to comment.