Skip to content

Commit

Permalink
Upgrade to v4.25.0 of the Google Beta Terraform Provider (#833)
Browse files Browse the repository at this point in the history
  • Loading branch information
stack72 committed Jun 17, 2022
1 parent fcedd25 commit 5b24856
Show file tree
Hide file tree
Showing 146 changed files with 4,282 additions and 528 deletions.
412 changes: 382 additions & 30 deletions provider/cmd/pulumi-resource-gcp/schema.json

Large diffs are not rendered by default.

23 changes: 12 additions & 11 deletions provider/go.mod
Expand Up @@ -31,7 +31,7 @@ require (
github.com/Azure/go-autorest/autorest/validation v0.3.1 // indirect
github.com/Azure/go-autorest/logger v0.2.1 // indirect
github.com/Azure/go-autorest/tracing v0.6.0 // indirect
github.com/GoogleCloudPlatform/declarative-resource-client-library v1.8.2 // indirect
github.com/GoogleCloudPlatform/declarative-resource-client-library v1.10.0 // indirect
github.com/Masterminds/goutils v1.1.0 // indirect
github.com/Masterminds/semver v1.5.0 // indirect
github.com/Masterminds/sprig v2.22.0+incompatible // indirect
Expand Down Expand Up @@ -85,7 +85,7 @@ require (
github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 // indirect
github.com/google/uuid v1.3.0 // indirect
github.com/google/wire v0.5.0 // indirect
github.com/googleapis/gax-go/v2 v2.3.0 // indirect
github.com/googleapis/gax-go/v2 v2.4.0 // indirect
github.com/googleapis/go-type-adapters v1.0.0 // indirect
github.com/gorilla/mux v1.8.0 // indirect
github.com/grpc-ecosystem/go-grpc-middleware v1.3.0 // indirect
Expand Down Expand Up @@ -200,18 +200,18 @@ require (
gocloud.dev/secrets/hashivault v0.24.0 // indirect
golang.org/x/crypto v0.0.0-20220131195533-30dcbda58838 // indirect
golang.org/x/mod v0.5.0 // indirect
golang.org/x/net v0.0.0-20220425223048-2871e0cb64e4 // indirect
golang.org/x/oauth2 v0.0.0-20220411215720-9780585627b5 // indirect
golang.org/x/sync v0.0.0-20210220032951-036812b2e83c // indirect
golang.org/x/sys v0.0.0-20220503163025-988cb79eb6c6 // indirect
golang.org/x/net v0.0.0-20220526153639-5463443f8c37 // indirect
golang.org/x/oauth2 v0.0.0-20220524215830-622c5d57e401 // indirect
golang.org/x/sync v0.0.0-20220513210516-0976fa681c29 // indirect
golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a // indirect
golang.org/x/term v0.0.0-20210927222741-03fcf44c2211 // indirect
golang.org/x/text v0.3.7 // indirect
golang.org/x/time v0.0.0-20210723032227-1f47c861a9ac // indirect
golang.org/x/xerrors v0.0.0-20220411194840-2f41105eb62f // indirect
google.golang.org/api v0.79.0 // indirect
golang.org/x/xerrors v0.0.0-20220517211312-f3a8303e98df // indirect
google.golang.org/api v0.82.0 // indirect
google.golang.org/appengine v1.6.7 // indirect
google.golang.org/genproto v0.0.0-20220505152158-f39f71e6c8f3 // indirect
google.golang.org/grpc v1.46.0 // indirect
google.golang.org/genproto v0.0.0-20220527130721-00d5c0f3be58 // indirect
google.golang.org/grpc v1.46.2 // indirect
google.golang.org/protobuf v1.28.0 // indirect
gopkg.in/AlecAivazis/survey.v1 v1.8.9-0.20200217094205-6773bdf39b7f // indirect
gopkg.in/square/go-jose.v2 v2.6.0 // indirect
Expand All @@ -225,6 +225,7 @@ require (

replace (
github.com/hashicorp/terraform-plugin-sdk/v2 => github.com/pulumi/terraform-plugin-sdk/v2 v2.0.0-20220523144019-a9dc436975cc
github.com/hashicorp/terraform-provider-google-beta => github.com/pulumi/terraform-provider-google-beta v0.0.0-20220610113829-6340bbf2d502
github.com/hashicorp/terraform-provider-google-beta => github.com/pulumi/terraform-provider-google-beta v0.0.0-20220616093159-3f49f5dca146
github.com/hashicorp/vault => github.com/hashicorp/vault v1.2.0
google.golang.org/genproto => google.golang.org/genproto v0.0.0-20220505152158-f39f71e6c8f3
)
144 changes: 22 additions & 122 deletions provider/go.sum

Large diffs are not rendered by default.

Expand Up @@ -26,6 +26,15 @@ public sealed class TableExternalDataConfigurationArgs : Pulumi.ResourceArgs
[Input("compression")]
public Input<string>? Compression { get; set; }

/// <summary>
/// The connection specifying the credentials to be used to read
/// external storage, such as Azure Blob, Cloud Storage, or S3. The `connection_id` can have
/// the form `{{project}}.{{location}}.{{connection_id}}`
/// or `projects/{{project}}/locations/{{location}}/connections/{{connection_id}}`.
/// </summary>
[Input("connectionId")]
public Input<string>? ConnectionId { get; set; }

/// <summary>
/// Additional properties to set if
/// `source_format` is set to "CSV". Structure is documented below.
Expand Down
Expand Up @@ -26,6 +26,15 @@ public sealed class TableExternalDataConfigurationGetArgs : Pulumi.ResourceArgs
[Input("compression")]
public Input<string>? Compression { get; set; }

/// <summary>
/// The connection specifying the credentials to be used to read
/// external storage, such as Azure Blob, Cloud Storage, or S3. The `connection_id` can have
/// the form `{{project}}.{{location}}.{{connection_id}}`
/// or `projects/{{project}}/locations/{{location}}/connections/{{connection_id}}`.
/// </summary>
[Input("connectionId")]
public Input<string>? ConnectionId { get; set; }

/// <summary>
/// Additional properties to set if
/// `source_format` is set to "CSV". Structure is documented below.
Expand Down
10 changes: 10 additions & 0 deletions sdk/dotnet/BigQuery/Outputs/TableExternalDataConfiguration.cs
Expand Up @@ -24,6 +24,13 @@ public sealed class TableExternalDataConfiguration
/// </summary>
public readonly string? Compression;
/// <summary>
/// The connection specifying the credentials to be used to read
/// external storage, such as Azure Blob, Cloud Storage, or S3. The `connection_id` can have
/// the form `{{project}}.{{location}}.{{connection_id}}`
/// or `projects/{{project}}/locations/{{location}}/connections/{{connection_id}}`.
/// </summary>
public readonly string? ConnectionId;
/// <summary>
/// Additional properties to set if
/// `source_format` is set to "CSV". Structure is documented below.
/// </summary>
Expand Down Expand Up @@ -89,6 +96,8 @@ public sealed class TableExternalDataConfiguration

string? compression,

string? connectionId,

Outputs.TableExternalDataConfigurationCsvOptions? csvOptions,

Outputs.TableExternalDataConfigurationGoogleSheetsOptions? googleSheetsOptions,
Expand All @@ -107,6 +116,7 @@ public sealed class TableExternalDataConfiguration
{
Autodetect = autodetect;
Compression = compression;
ConnectionId = connectionId;
CsvOptions = csvOptions;
GoogleSheetsOptions = googleSheetsOptions;
HivePartitioningOptions = hivePartitioningOptions;
Expand Down
2 changes: 1 addition & 1 deletion sdk/dotnet/CloudDeploy/DeliveryPipeline.cs
Expand Up @@ -10,7 +10,7 @@
namespace Pulumi.Gcp.CloudDeploy
{
/// <summary>
/// The Clouddeploy DeliveryPipeline resource
/// The Cloud Deploy `DeliveryPipeline` resource
///
/// ## Example Usage
/// ### Delivery_pipeline
Expand Down
2 changes: 1 addition & 1 deletion sdk/dotnet/CloudDeploy/Target.cs
Expand Up @@ -10,7 +10,7 @@
namespace Pulumi.Gcp.CloudDeploy
{
/// <summary>
/// The Clouddeploy Target resource
/// The Cloud Deploy `Target` resource
///
/// ## Example Usage
/// ### Target
Expand Down
10 changes: 10 additions & 0 deletions sdk/dotnet/CloudFunctionsV2/Function.cs
Expand Up @@ -78,6 +78,14 @@ namespace Pulumi.Gcp.CloudFunctionsV2
/// {
/// public MyStack()
/// {
/// var account = new Gcp.ServiceAccount.Account("account", new Gcp.ServiceAccount.AccountArgs
/// {
/// AccountId = "test-service-account",
/// DisplayName = "Test Service Account",
/// }, new CustomResourceOptions
/// {
/// Provider = google_beta,
/// });
/// var sub = new Gcp.PubSub.Topic("sub", new Gcp.PubSub.TopicArgs
/// {
/// }, new CustomResourceOptions
Expand Down Expand Up @@ -133,13 +141,15 @@ namespace Pulumi.Gcp.CloudFunctionsV2
/// },
/// IngressSettings = "ALLOW_INTERNAL_ONLY",
/// AllTrafficOnLatestRevision = true,
/// ServiceAccountEmail = account.Email,
/// },
/// EventTrigger = new Gcp.CloudFunctionsV2.Inputs.FunctionEventTriggerArgs
/// {
/// TriggerRegion = "us-central1",
/// EventType = "google.cloud.pubsub.topic.v1.messagePublished",
/// PubsubTopic = sub.Id,
/// RetryPolicy = "RETRY_POLICY_RETRY",
/// ServiceAccountEmail = account.Email,
/// },
/// }, new CustomResourceOptions
/// {
Expand Down
Expand Up @@ -34,7 +34,6 @@ public sealed class FunctionEventTriggerArgs : Pulumi.ResourceArgs
public Input<string>? RetryPolicy { get; set; }

/// <summary>
/// -
/// The email of the service account for this function.
/// </summary>
[Input("serviceAccountEmail")]
Expand Down
Expand Up @@ -34,7 +34,6 @@ public sealed class FunctionEventTriggerGetArgs : Pulumi.ResourceArgs
public Input<string>? RetryPolicy { get; set; }

/// <summary>
/// -
/// The email of the service account for this function.
/// </summary>
[Input("serviceAccountEmail")]
Expand Down
Expand Up @@ -74,7 +74,6 @@ public InputMap<string> EnvironmentVariables
public Input<string>? Service { get; set; }

/// <summary>
/// -
/// The email of the service account for this function.
/// </summary>
[Input("serviceAccountEmail")]
Expand Down
Expand Up @@ -74,7 +74,6 @@ public InputMap<string> EnvironmentVariables
public Input<string>? Service { get; set; }

/// <summary>
/// -
/// The email of the service account for this function.
/// </summary>
[Input("serviceAccountEmail")]
Expand Down
Expand Up @@ -29,7 +29,6 @@ public sealed class FunctionEventTrigger
/// </summary>
public readonly string? RetryPolicy;
/// <summary>
/// -
/// The email of the service account for this function.
/// </summary>
public readonly string? ServiceAccountEmail;
Expand Down
Expand Up @@ -53,7 +53,6 @@ public sealed class FunctionServiceConfig
/// </summary>
public readonly string? Service;
/// <summary>
/// -
/// The email of the service account for this function.
/// </summary>
public readonly string? ServiceAccountEmail;
Expand Down
36 changes: 36 additions & 0 deletions sdk/dotnet/Compute/BackendService.cs
Expand Up @@ -83,6 +83,42 @@ namespace Pulumi.Gcp.Compute
///
/// }
/// ```
/// ### Backend Service Cache Include Named Cookies
///
/// ```csharp
/// using Pulumi;
/// using Gcp = Pulumi.Gcp;
///
/// class MyStack : Stack
/// {
/// public MyStack()
/// {
/// var @default = new Gcp.Compute.BackendService("default", new Gcp.Compute.BackendServiceArgs
/// {
/// CdnPolicy = new Gcp.Compute.Inputs.BackendServiceCdnPolicyArgs
/// {
/// CacheKeyPolicy = new Gcp.Compute.Inputs.BackendServiceCdnPolicyCacheKeyPolicyArgs
/// {
/// IncludeHost = true,
/// IncludeNamedCookies =
/// {
/// "__next_preview_data",
/// "__prerender_bypass",
/// },
/// IncludeProtocol = true,
/// IncludeQueryString = true,
/// },
/// CacheMode = "CACHE_ALL_STATIC",
/// ClientTtl = 7200,
/// DefaultTtl = 3600,
/// MaxTtl = 10800,
/// },
/// EnableCdn = true,
/// });
/// }
///
/// }
/// ```
/// ### Backend Service Cache
///
/// ```csharp
Expand Down
Expand Up @@ -18,6 +18,18 @@ public sealed class BackendServiceCdnPolicyCacheKeyPolicyArgs : Pulumi.ResourceA
[Input("includeHost")]
public Input<bool>? IncludeHost { get; set; }

[Input("includeNamedCookies")]
private InputList<string>? _includeNamedCookies;

/// <summary>
/// Names of cookies to include in cache keys.
/// </summary>
public InputList<string> IncludeNamedCookies
{
get => _includeNamedCookies ?? (_includeNamedCookies = new InputList<string>());
set => _includeNamedCookies = value;
}

/// <summary>
/// If true, http and https requests will be cached separately.
/// </summary>
Expand Down
Expand Up @@ -18,6 +18,18 @@ public sealed class BackendServiceCdnPolicyCacheKeyPolicyGetArgs : Pulumi.Resour
[Input("includeHost")]
public Input<bool>? IncludeHost { get; set; }

[Input("includeNamedCookies")]
private InputList<string>? _includeNamedCookies;

/// <summary>
/// Names of cookies to include in cache keys.
/// </summary>
public InputList<string> IncludeNamedCookies
{
get => _includeNamedCookies ?? (_includeNamedCookies = new InputList<string>());
set => _includeNamedCookies = value;
}

/// <summary>
/// If true, http and https requests will be cached separately.
/// </summary>
Expand Down
Expand Up @@ -18,6 +18,18 @@ public sealed class RegionBackendServiceCdnPolicyCacheKeyPolicyArgs : Pulumi.Res
[Input("includeHost")]
public Input<bool>? IncludeHost { get; set; }

[Input("includeNamedCookies")]
private InputList<string>? _includeNamedCookies;

/// <summary>
/// Names of cookies to include in cache keys.
/// </summary>
public InputList<string> IncludeNamedCookies
{
get => _includeNamedCookies ?? (_includeNamedCookies = new InputList<string>());
set => _includeNamedCookies = value;
}

/// <summary>
/// If true, http and https requests will be cached separately.
/// </summary>
Expand Down
Expand Up @@ -18,6 +18,18 @@ public sealed class RegionBackendServiceCdnPolicyCacheKeyPolicyGetArgs : Pulumi.
[Input("includeHost")]
public Input<bool>? IncludeHost { get; set; }

[Input("includeNamedCookies")]
private InputList<string>? _includeNamedCookies;

/// <summary>
/// Names of cookies to include in cache keys.
/// </summary>
public InputList<string> IncludeNamedCookies
{
get => _includeNamedCookies ?? (_includeNamedCookies = new InputList<string>());
set => _includeNamedCookies = value;
}

/// <summary>
/// If true, http and https requests will be cached separately.
/// </summary>
Expand Down
@@ -0,0 +1,35 @@
// *** 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! ***

using System;
using System.Collections.Generic;
using System.Collections.Immutable;
using System.Threading.Tasks;
using Pulumi.Serialization;

namespace Pulumi.Gcp.Compute.Inputs
{

public sealed class SecurityPolicyAdvancedOptionsConfigArgs : Pulumi.ResourceArgs
{
/// <summary>
/// Whether or not to JSON parse the payload body. Defaults to `DISABLED`.
/// * DISABLED - Don't parse JSON payloads in POST bodies.
/// * STANDARD - Parse JSON payloads in POST bodies.
/// </summary>
[Input("jsonParsing")]
public Input<string>? JsonParsing { get; set; }

/// <summary>
/// Log level to use. Defaults to `NORMAL`.
/// * NORMAL - Normal log level.
/// * VERBOSE - Verbose log level.
/// </summary>
[Input("logLevel")]
public Input<string>? LogLevel { get; set; }

public SecurityPolicyAdvancedOptionsConfigArgs()
{
}
}
}

0 comments on commit 5b24856

Please sign in to comment.