diff --git a/apis/Google.Cloud.AppEngine.V1/Google.Cloud.AppEngine.V1.Tests/InstancesClientTest.g.cs b/apis/Google.Cloud.AppEngine.V1/Google.Cloud.AppEngine.V1.Tests/InstancesClientTest.g.cs index 33353c2de5bc..de984bc65d00 100644 --- a/apis/Google.Cloud.AppEngine.V1/Google.Cloud.AppEngine.V1.Tests/InstancesClientTest.g.cs +++ b/apis/Google.Cloud.AppEngine.V1/Google.Cloud.AppEngine.V1.Tests/InstancesClientTest.g.cs @@ -39,7 +39,7 @@ public void GetInstanceRequestObject() }; Instance expectedResponse = new Instance { - Name = "name1c9368b0", + InstanceName = InstanceName.FromAppServiceVersionInstance("[APP]", "[SERVICE]", "[VERSION]", "[INSTANCE]"), Id = "id74b70bb8", AppEngineRelease = "app_engine_release0d3b73e6", Availability = Instance.Types.Availability.Unspecified, @@ -55,6 +55,7 @@ public void GetInstanceRequestObject() VmStatus = "vm_status3752e225", VmDebugEnabled = false, VmIp = "vm_ipe63c1f99", + VmLiveness = Instance.Types.Liveness.Types.LivenessState.Draining, }; mockGrpcClient.Setup(x => x.GetInstance(request, moq::It.IsAny())).Returns(expectedResponse); InstancesClient client = new InstancesClientImpl(mockGrpcClient.Object, null); @@ -74,7 +75,7 @@ public void GetInstanceRequestObject() }; Instance expectedResponse = new Instance { - Name = "name1c9368b0", + InstanceName = InstanceName.FromAppServiceVersionInstance("[APP]", "[SERVICE]", "[VERSION]", "[INSTANCE]"), Id = "id74b70bb8", AppEngineRelease = "app_engine_release0d3b73e6", Availability = Instance.Types.Availability.Unspecified, @@ -90,6 +91,7 @@ public void GetInstanceRequestObject() VmStatus = "vm_status3752e225", VmDebugEnabled = false, VmIp = "vm_ipe63c1f99", + VmLiveness = Instance.Types.Liveness.Types.LivenessState.Draining, }; mockGrpcClient.Setup(x => x.GetInstanceAsync(request, moq::It.IsAny())).Returns(new grpccore::AsyncUnaryCall(stt::Task.FromResult(expectedResponse), null, null, null, null)); InstancesClient client = new InstancesClientImpl(mockGrpcClient.Object, null); diff --git a/apis/Google.Cloud.AppEngine.V1/Google.Cloud.AppEngine.V1.Tests/ServicesClientTest.g.cs b/apis/Google.Cloud.AppEngine.V1/Google.Cloud.AppEngine.V1.Tests/ServicesClientTest.g.cs index 2692a31b190a..db41a8d7b8f2 100644 --- a/apis/Google.Cloud.AppEngine.V1/Google.Cloud.AppEngine.V1.Tests/ServicesClientTest.g.cs +++ b/apis/Google.Cloud.AppEngine.V1/Google.Cloud.AppEngine.V1.Tests/ServicesClientTest.g.cs @@ -41,6 +41,7 @@ public void GetServiceRequestObject() Name = "name1c9368b0", Id = "id74b70bb8", Split = new TrafficSplit(), + NetworkSettings = new NetworkSettings(), }; mockGrpcClient.Setup(x => x.GetService(request, moq::It.IsAny())).Returns(expectedResponse); ServicesClient client = new ServicesClientImpl(mockGrpcClient.Object, null); @@ -63,6 +64,7 @@ public void GetServiceRequestObject() Name = "name1c9368b0", Id = "id74b70bb8", Split = new TrafficSplit(), + NetworkSettings = new NetworkSettings(), }; mockGrpcClient.Setup(x => x.GetServiceAsync(request, moq::It.IsAny())).Returns(new grpccore::AsyncUnaryCall(stt::Task.FromResult(expectedResponse), null, null, null, null)); ServicesClient client = new ServicesClientImpl(mockGrpcClient.Object, null); diff --git a/apis/Google.Cloud.AppEngine.V1/Google.Cloud.AppEngine.V1.Tests/VersionsClientTest.g.cs b/apis/Google.Cloud.AppEngine.V1/Google.Cloud.AppEngine.V1.Tests/VersionsClientTest.g.cs index bf837d64aa30..a94dc4c0f3f4 100644 --- a/apis/Google.Cloud.AppEngine.V1/Google.Cloud.AppEngine.V1.Tests/VersionsClientTest.g.cs +++ b/apis/Google.Cloud.AppEngine.V1/Google.Cloud.AppEngine.V1.Tests/VersionsClientTest.g.cs @@ -92,6 +92,14 @@ public void GetVersionRequestObject() Zones = { "zones3641f926", }, VpcAccessConnector = new VpcAccessConnector(), Entrypoint = new Entrypoint(), + BuildEnvVariables = + { + { + "key8a0b6e3c", + "value60c16320" + }, + }, + ServiceAccount = "service_accounta3c1b923", }; mockGrpcClient.Setup(x => x.GetVersion(request, moq::It.IsAny())).Returns(expectedResponse); VersionsClient client = new VersionsClientImpl(mockGrpcClient.Object, null); @@ -164,6 +172,14 @@ public void GetVersionRequestObject() Zones = { "zones3641f926", }, VpcAccessConnector = new VpcAccessConnector(), Entrypoint = new Entrypoint(), + BuildEnvVariables = + { + { + "key8a0b6e3c", + "value60c16320" + }, + }, + ServiceAccount = "service_accounta3c1b923", }; mockGrpcClient.Setup(x => x.GetVersionAsync(request, moq::It.IsAny())).Returns(new grpccore::AsyncUnaryCall(stt::Task.FromResult(expectedResponse), null, null, null, null)); VersionsClient client = new VersionsClientImpl(mockGrpcClient.Object, null); diff --git a/apis/Google.Cloud.AppEngine.V1/Google.Cloud.AppEngine.V1/AppengineGrpc.cs b/apis/Google.Cloud.AppEngine.V1/Google.Cloud.AppEngine.V1/AppengineGrpc.cs index 060400935ade..a387e17f8795 100644 --- a/apis/Google.Cloud.AppEngine.V1/Google.Cloud.AppEngine.V1/AppengineGrpc.cs +++ b/apis/Google.Cloud.AppEngine.V1/Google.Cloud.AppEngine.V1/AppengineGrpc.cs @@ -3,7 +3,7 @@ // source: google/appengine/v1/appengine.proto // // Original file comments: -// Copyright 2020 Google LLC +// Copyright 2021 Google LLC // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/apis/Google.Cloud.AppEngine.V1/Google.Cloud.AppEngine.V1/ApplicationsClient.g.cs b/apis/Google.Cloud.AppEngine.V1/Google.Cloud.AppEngine.V1/ApplicationsClient.g.cs index 78a77b79073f..a742c31ed499 100644 --- a/apis/Google.Cloud.AppEngine.V1/Google.Cloud.AppEngine.V1/ApplicationsClient.g.cs +++ b/apis/Google.Cloud.AppEngine.V1/Google.Cloud.AppEngine.V1/ApplicationsClient.g.cs @@ -63,10 +63,10 @@ private ApplicationsSettings(ApplicationsSettings existing) : base(existing) /// /// /// This call will not be retried. - /// No timeout is applied. + /// Timeout: 60 seconds. /// /// - public gaxgrpc::CallSettings GetApplicationSettings { get; set; } = gaxgrpc::CallSettings.FromExpiration(gax::Expiration.None); + public gaxgrpc::CallSettings GetApplicationSettings { get; set; } = gaxgrpc::CallSettings.FromExpiration(gax::Expiration.FromTimeout(sys::TimeSpan.FromMilliseconds(60000))); /// /// for synchronous and asynchronous calls to @@ -75,10 +75,10 @@ private ApplicationsSettings(ApplicationsSettings existing) : base(existing) /// /// /// This call will not be retried. - /// No timeout is applied. + /// Timeout: 60 seconds. /// /// - public gaxgrpc::CallSettings CreateApplicationSettings { get; set; } = gaxgrpc::CallSettings.FromExpiration(gax::Expiration.None); + public gaxgrpc::CallSettings CreateApplicationSettings { get; set; } = gaxgrpc::CallSettings.FromExpiration(gax::Expiration.FromTimeout(sys::TimeSpan.FromMilliseconds(60000))); /// /// Long Running Operation settings for calls to ApplicationsClient.CreateApplication and @@ -105,10 +105,10 @@ private ApplicationsSettings(ApplicationsSettings existing) : base(existing) /// /// /// This call will not be retried. - /// No timeout is applied. + /// Timeout: 60 seconds. /// /// - public gaxgrpc::CallSettings UpdateApplicationSettings { get; set; } = gaxgrpc::CallSettings.FromExpiration(gax::Expiration.None); + public gaxgrpc::CallSettings UpdateApplicationSettings { get; set; } = gaxgrpc::CallSettings.FromExpiration(gax::Expiration.FromTimeout(sys::TimeSpan.FromMilliseconds(60000))); /// /// Long Running Operation settings for calls to ApplicationsClient.UpdateApplication and @@ -135,10 +135,10 @@ private ApplicationsSettings(ApplicationsSettings existing) : base(existing) /// /// /// This call will not be retried. - /// No timeout is applied. + /// Timeout: 60 seconds. /// /// - public gaxgrpc::CallSettings RepairApplicationSettings { get; set; } = gaxgrpc::CallSettings.FromExpiration(gax::Expiration.None); + public gaxgrpc::CallSettings RepairApplicationSettings { get; set; } = gaxgrpc::CallSettings.FromExpiration(gax::Expiration.FromTimeout(sys::TimeSpan.FromMilliseconds(60000))); /// /// Long Running Operation settings for calls to ApplicationsClient.RepairApplication and diff --git a/apis/Google.Cloud.AppEngine.V1/Google.Cloud.AppEngine.V1/AuthorizedCertificatesClient.g.cs b/apis/Google.Cloud.AppEngine.V1/Google.Cloud.AppEngine.V1/AuthorizedCertificatesClient.g.cs index da17ea44ae0a..5d3ad6f35d4a 100644 --- a/apis/Google.Cloud.AppEngine.V1/Google.Cloud.AppEngine.V1/AuthorizedCertificatesClient.g.cs +++ b/apis/Google.Cloud.AppEngine.V1/Google.Cloud.AppEngine.V1/AuthorizedCertificatesClient.g.cs @@ -65,10 +65,10 @@ private AuthorizedCertificatesSettings(AuthorizedCertificatesSettings existing) /// /// /// This call will not be retried. - /// No timeout is applied. + /// Timeout: 60 seconds. /// /// - public gaxgrpc::CallSettings ListAuthorizedCertificatesSettings { get; set; } = gaxgrpc::CallSettings.FromExpiration(gax::Expiration.None); + public gaxgrpc::CallSettings ListAuthorizedCertificatesSettings { get; set; } = gaxgrpc::CallSettings.FromExpiration(gax::Expiration.FromTimeout(sys::TimeSpan.FromMilliseconds(60000))); /// /// for synchronous and asynchronous calls to @@ -78,10 +78,10 @@ private AuthorizedCertificatesSettings(AuthorizedCertificatesSettings existing) /// /// /// This call will not be retried. - /// No timeout is applied. + /// Timeout: 60 seconds. /// /// - public gaxgrpc::CallSettings GetAuthorizedCertificateSettings { get; set; } = gaxgrpc::CallSettings.FromExpiration(gax::Expiration.None); + public gaxgrpc::CallSettings GetAuthorizedCertificateSettings { get; set; } = gaxgrpc::CallSettings.FromExpiration(gax::Expiration.FromTimeout(sys::TimeSpan.FromMilliseconds(60000))); /// /// for synchronous and asynchronous calls to @@ -91,10 +91,10 @@ private AuthorizedCertificatesSettings(AuthorizedCertificatesSettings existing) /// /// /// This call will not be retried. - /// No timeout is applied. + /// Timeout: 60 seconds. /// /// - public gaxgrpc::CallSettings CreateAuthorizedCertificateSettings { get; set; } = gaxgrpc::CallSettings.FromExpiration(gax::Expiration.None); + public gaxgrpc::CallSettings CreateAuthorizedCertificateSettings { get; set; } = gaxgrpc::CallSettings.FromExpiration(gax::Expiration.FromTimeout(sys::TimeSpan.FromMilliseconds(60000))); /// /// for synchronous and asynchronous calls to @@ -104,10 +104,10 @@ private AuthorizedCertificatesSettings(AuthorizedCertificatesSettings existing) /// /// /// This call will not be retried. - /// No timeout is applied. + /// Timeout: 60 seconds. /// /// - public gaxgrpc::CallSettings UpdateAuthorizedCertificateSettings { get; set; } = gaxgrpc::CallSettings.FromExpiration(gax::Expiration.None); + public gaxgrpc::CallSettings UpdateAuthorizedCertificateSettings { get; set; } = gaxgrpc::CallSettings.FromExpiration(gax::Expiration.FromTimeout(sys::TimeSpan.FromMilliseconds(60000))); /// /// for synchronous and asynchronous calls to @@ -117,10 +117,10 @@ private AuthorizedCertificatesSettings(AuthorizedCertificatesSettings existing) /// /// /// This call will not be retried. - /// No timeout is applied. + /// Timeout: 60 seconds. /// /// - public gaxgrpc::CallSettings DeleteAuthorizedCertificateSettings { get; set; } = gaxgrpc::CallSettings.FromExpiration(gax::Expiration.None); + public gaxgrpc::CallSettings DeleteAuthorizedCertificateSettings { get; set; } = gaxgrpc::CallSettings.FromExpiration(gax::Expiration.FromTimeout(sys::TimeSpan.FromMilliseconds(60000))); /// Creates a deep clone of this object, with all the same property values. /// A deep clone of this object. diff --git a/apis/Google.Cloud.AppEngine.V1/Google.Cloud.AppEngine.V1/AuthorizedDomainsClient.g.cs b/apis/Google.Cloud.AppEngine.V1/Google.Cloud.AppEngine.V1/AuthorizedDomainsClient.g.cs index b816eef5249f..33586c4f4486 100644 --- a/apis/Google.Cloud.AppEngine.V1/Google.Cloud.AppEngine.V1/AuthorizedDomainsClient.g.cs +++ b/apis/Google.Cloud.AppEngine.V1/Google.Cloud.AppEngine.V1/AuthorizedDomainsClient.g.cs @@ -58,10 +58,10 @@ private AuthorizedDomainsSettings(AuthorizedDomainsSettings existing) : base(exi /// /// /// This call will not be retried. - /// No timeout is applied. + /// Timeout: 60 seconds. /// /// - public gaxgrpc::CallSettings ListAuthorizedDomainsSettings { get; set; } = gaxgrpc::CallSettings.FromExpiration(gax::Expiration.None); + public gaxgrpc::CallSettings ListAuthorizedDomainsSettings { get; set; } = gaxgrpc::CallSettings.FromExpiration(gax::Expiration.FromTimeout(sys::TimeSpan.FromMilliseconds(60000))); /// Creates a deep clone of this object, with all the same property values. /// A deep clone of this object. diff --git a/apis/Google.Cloud.AppEngine.V1/Google.Cloud.AppEngine.V1/DomainMappingsClient.g.cs b/apis/Google.Cloud.AppEngine.V1/Google.Cloud.AppEngine.V1/DomainMappingsClient.g.cs index 029328ccd198..8cbf678bb39c 100644 --- a/apis/Google.Cloud.AppEngine.V1/Google.Cloud.AppEngine.V1/DomainMappingsClient.g.cs +++ b/apis/Google.Cloud.AppEngine.V1/Google.Cloud.AppEngine.V1/DomainMappingsClient.g.cs @@ -66,10 +66,10 @@ private DomainMappingsSettings(DomainMappingsSettings existing) : base(existing) /// /// /// This call will not be retried. - /// No timeout is applied. + /// Timeout: 60 seconds. /// /// - public gaxgrpc::CallSettings ListDomainMappingsSettings { get; set; } = gaxgrpc::CallSettings.FromExpiration(gax::Expiration.None); + public gaxgrpc::CallSettings ListDomainMappingsSettings { get; set; } = gaxgrpc::CallSettings.FromExpiration(gax::Expiration.FromTimeout(sys::TimeSpan.FromMilliseconds(60000))); /// /// for synchronous and asynchronous calls to @@ -78,10 +78,10 @@ private DomainMappingsSettings(DomainMappingsSettings existing) : base(existing) /// /// /// This call will not be retried. - /// No timeout is applied. + /// Timeout: 60 seconds. /// /// - public gaxgrpc::CallSettings GetDomainMappingSettings { get; set; } = gaxgrpc::CallSettings.FromExpiration(gax::Expiration.None); + public gaxgrpc::CallSettings GetDomainMappingSettings { get; set; } = gaxgrpc::CallSettings.FromExpiration(gax::Expiration.FromTimeout(sys::TimeSpan.FromMilliseconds(60000))); /// /// for synchronous and asynchronous calls to @@ -90,10 +90,10 @@ private DomainMappingsSettings(DomainMappingsSettings existing) : base(existing) /// /// /// This call will not be retried. - /// No timeout is applied. + /// Timeout: 60 seconds. /// /// - public gaxgrpc::CallSettings CreateDomainMappingSettings { get; set; } = gaxgrpc::CallSettings.FromExpiration(gax::Expiration.None); + public gaxgrpc::CallSettings CreateDomainMappingSettings { get; set; } = gaxgrpc::CallSettings.FromExpiration(gax::Expiration.FromTimeout(sys::TimeSpan.FromMilliseconds(60000))); /// /// Long Running Operation settings for calls to DomainMappingsClient.CreateDomainMapping and @@ -120,10 +120,10 @@ private DomainMappingsSettings(DomainMappingsSettings existing) : base(existing) /// /// /// This call will not be retried. - /// No timeout is applied. + /// Timeout: 60 seconds. /// /// - public gaxgrpc::CallSettings UpdateDomainMappingSettings { get; set; } = gaxgrpc::CallSettings.FromExpiration(gax::Expiration.None); + public gaxgrpc::CallSettings UpdateDomainMappingSettings { get; set; } = gaxgrpc::CallSettings.FromExpiration(gax::Expiration.FromTimeout(sys::TimeSpan.FromMilliseconds(60000))); /// /// Long Running Operation settings for calls to DomainMappingsClient.UpdateDomainMapping and @@ -150,10 +150,10 @@ private DomainMappingsSettings(DomainMappingsSettings existing) : base(existing) /// /// /// This call will not be retried. - /// No timeout is applied. + /// Timeout: 60 seconds. /// /// - public gaxgrpc::CallSettings DeleteDomainMappingSettings { get; set; } = gaxgrpc::CallSettings.FromExpiration(gax::Expiration.None); + public gaxgrpc::CallSettings DeleteDomainMappingSettings { get; set; } = gaxgrpc::CallSettings.FromExpiration(gax::Expiration.FromTimeout(sys::TimeSpan.FromMilliseconds(60000))); /// /// Long Running Operation settings for calls to DomainMappingsClient.DeleteDomainMapping and diff --git a/apis/Google.Cloud.AppEngine.V1/Google.Cloud.AppEngine.V1/FirewallClient.g.cs b/apis/Google.Cloud.AppEngine.V1/Google.Cloud.AppEngine.V1/FirewallClient.g.cs index 7d6f36b155a6..aa59109cf615 100644 --- a/apis/Google.Cloud.AppEngine.V1/Google.Cloud.AppEngine.V1/FirewallClient.g.cs +++ b/apis/Google.Cloud.AppEngine.V1/Google.Cloud.AppEngine.V1/FirewallClient.g.cs @@ -63,10 +63,10 @@ private FirewallSettings(FirewallSettings existing) : base(existing) /// /// /// This call will not be retried. - /// No timeout is applied. + /// Timeout: 60 seconds. /// /// - public gaxgrpc::CallSettings ListIngressRulesSettings { get; set; } = gaxgrpc::CallSettings.FromExpiration(gax::Expiration.None); + public gaxgrpc::CallSettings ListIngressRulesSettings { get; set; } = gaxgrpc::CallSettings.FromExpiration(gax::Expiration.FromTimeout(sys::TimeSpan.FromMilliseconds(60000))); /// /// for synchronous and asynchronous calls to @@ -75,10 +75,10 @@ private FirewallSettings(FirewallSettings existing) : base(existing) /// /// /// This call will not be retried. - /// No timeout is applied. + /// Timeout: 60 seconds. /// /// - public gaxgrpc::CallSettings BatchUpdateIngressRulesSettings { get; set; } = gaxgrpc::CallSettings.FromExpiration(gax::Expiration.None); + public gaxgrpc::CallSettings BatchUpdateIngressRulesSettings { get; set; } = gaxgrpc::CallSettings.FromExpiration(gax::Expiration.FromTimeout(sys::TimeSpan.FromMilliseconds(60000))); /// /// for synchronous and asynchronous calls to @@ -87,10 +87,10 @@ private FirewallSettings(FirewallSettings existing) : base(existing) /// /// /// This call will not be retried. - /// No timeout is applied. + /// Timeout: 60 seconds. /// /// - public gaxgrpc::CallSettings CreateIngressRuleSettings { get; set; } = gaxgrpc::CallSettings.FromExpiration(gax::Expiration.None); + public gaxgrpc::CallSettings CreateIngressRuleSettings { get; set; } = gaxgrpc::CallSettings.FromExpiration(gax::Expiration.FromTimeout(sys::TimeSpan.FromMilliseconds(60000))); /// /// for synchronous and asynchronous calls to @@ -99,10 +99,10 @@ private FirewallSettings(FirewallSettings existing) : base(existing) /// /// /// This call will not be retried. - /// No timeout is applied. + /// Timeout: 60 seconds. /// /// - public gaxgrpc::CallSettings GetIngressRuleSettings { get; set; } = gaxgrpc::CallSettings.FromExpiration(gax::Expiration.None); + public gaxgrpc::CallSettings GetIngressRuleSettings { get; set; } = gaxgrpc::CallSettings.FromExpiration(gax::Expiration.FromTimeout(sys::TimeSpan.FromMilliseconds(60000))); /// /// for synchronous and asynchronous calls to @@ -111,10 +111,10 @@ private FirewallSettings(FirewallSettings existing) : base(existing) /// /// /// This call will not be retried. - /// No timeout is applied. + /// Timeout: 60 seconds. /// /// - public gaxgrpc::CallSettings UpdateIngressRuleSettings { get; set; } = gaxgrpc::CallSettings.FromExpiration(gax::Expiration.None); + public gaxgrpc::CallSettings UpdateIngressRuleSettings { get; set; } = gaxgrpc::CallSettings.FromExpiration(gax::Expiration.FromTimeout(sys::TimeSpan.FromMilliseconds(60000))); /// /// for synchronous and asynchronous calls to @@ -123,10 +123,10 @@ private FirewallSettings(FirewallSettings existing) : base(existing) /// /// /// This call will not be retried. - /// No timeout is applied. + /// Timeout: 60 seconds. /// /// - public gaxgrpc::CallSettings DeleteIngressRuleSettings { get; set; } = gaxgrpc::CallSettings.FromExpiration(gax::Expiration.None); + public gaxgrpc::CallSettings DeleteIngressRuleSettings { get; set; } = gaxgrpc::CallSettings.FromExpiration(gax::Expiration.FromTimeout(sys::TimeSpan.FromMilliseconds(60000))); /// Creates a deep clone of this object, with all the same property values. /// A deep clone of this object. diff --git a/apis/Google.Cloud.AppEngine.V1/Google.Cloud.AppEngine.V1/Instance.cs b/apis/Google.Cloud.AppEngine.V1/Google.Cloud.AppEngine.V1/Instance.cs index 1951e12979a2..f619929873a0 100644 --- a/apis/Google.Cloud.AppEngine.V1/Google.Cloud.AppEngine.V1/Instance.cs +++ b/apis/Google.Cloud.AppEngine.V1/Google.Cloud.AppEngine.V1/Instance.cs @@ -25,27 +25,37 @@ public static partial class InstanceReflection { byte[] descriptorData = global::System.Convert.FromBase64String( string.Concat( "CiJnb29nbGUvYXBwZW5naW5lL3YxL2luc3RhbmNlLnByb3RvEhNnb29nbGUu", - "YXBwZW5naW5lLnYxGh9nb29nbGUvcHJvdG9idWYvdGltZXN0YW1wLnByb3Rv", - "Ghxnb29nbGUvYXBpL2Fubm90YXRpb25zLnByb3RvIr4DCghJbnN0YW5jZRIM", - "CgRuYW1lGAEgASgJEgoKAmlkGAIgASgJEhoKEmFwcF9lbmdpbmVfcmVsZWFz", - "ZRgDIAEoCRJACgxhdmFpbGFiaWxpdHkYBCABKA4yKi5nb29nbGUuYXBwZW5n", - "aW5lLnYxLkluc3RhbmNlLkF2YWlsYWJpbGl0eRIPCgd2bV9uYW1lGAUgASgJ", - "EhQKDHZtX3pvbmVfbmFtZRgGIAEoCRINCgV2bV9pZBgHIAEoCRIuCgpzdGFy", - "dF90aW1lGAggASgLMhouZ29vZ2xlLnByb3RvYnVmLlRpbWVzdGFtcBIQCghy", - "ZXF1ZXN0cxgJIAEoBRIOCgZlcnJvcnMYCiABKAUSCwoDcXBzGAsgASgCEhcK", - "D2F2ZXJhZ2VfbGF0ZW5jeRgMIAEoBRIUCgxtZW1vcnlfdXNhZ2UYDSABKAMS", - "EQoJdm1fc3RhdHVzGA4gASgJEhgKEHZtX2RlYnVnX2VuYWJsZWQYDyABKAgS", - "DQoFdm1faXAYECABKAkiOgoMQXZhaWxhYmlsaXR5Eg8KC1VOU1BFQ0lGSUVE", - "EAASDAoIUkVTSURFTlQQARILCgdEWU5BTUlDEAJCvwEKF2NvbS5nb29nbGUu", - "YXBwZW5naW5lLnYxQg1JbnN0YW5jZVByb3RvUAFaPGdvb2dsZS5nb2xhbmcu", - "b3JnL2dlbnByb3RvL2dvb2dsZWFwaXMvYXBwZW5naW5lL3YxO2FwcGVuZ2lu", - "ZaoCGUdvb2dsZS5DbG91ZC5BcHBFbmdpbmUuVjHKAhlHb29nbGVcQ2xvdWRc", - "QXBwRW5naW5lXFYx6gIcR29vZ2xlOjpDbG91ZDo6QXBwRW5naW5lOjpWMWIG", - "cHJvdG8z")); + "YXBwZW5naW5lLnYxGh9nb29nbGUvYXBpL2ZpZWxkX2JlaGF2aW9yLnByb3Rv", + "Ghlnb29nbGUvYXBpL3Jlc291cmNlLnByb3RvGh9nb29nbGUvcHJvdG9idWYv", + "dGltZXN0YW1wLnByb3RvGhxnb29nbGUvYXBpL2Fubm90YXRpb25zLnByb3Rv", + "Is4GCghJbnN0YW5jZRIRCgRuYW1lGAEgASgJQgPgQQMSDwoCaWQYAiABKAlC", + "A+BBAxIfChJhcHBfZW5naW5lX3JlbGVhc2UYAyABKAlCA+BBAxJFCgxhdmFp", + "bGFiaWxpdHkYBCABKA4yKi5nb29nbGUuYXBwZW5naW5lLnYxLkluc3RhbmNl", + "LkF2YWlsYWJpbGl0eUID4EEDEhQKB3ZtX25hbWUYBSABKAlCA+BBAxIZCgx2", + "bV96b25lX25hbWUYBiABKAlCA+BBAxISCgV2bV9pZBgHIAEoCUID4EEDEjMK", + "CnN0YXJ0X3RpbWUYCCABKAsyGi5nb29nbGUucHJvdG9idWYuVGltZXN0YW1w", + "QgPgQQMSFQoIcmVxdWVzdHMYCSABKAVCA+BBAxITCgZlcnJvcnMYCiABKAVC", + "A+BBAxIQCgNxcHMYCyABKAJCA+BBAxIcCg9hdmVyYWdlX2xhdGVuY3kYDCAB", + "KAVCA+BBAxIZCgxtZW1vcnlfdXNhZ2UYDSABKANCA+BBAxIWCgl2bV9zdGF0", + "dXMYDiABKAlCA+BBAxIdChB2bV9kZWJ1Z19lbmFibGVkGA8gASgIQgPgQQMS", + "EgoFdm1faXAYECABKAlCA+BBAxJOCgt2bV9saXZlbmVzcxgRIAEoDjI0Lmdv", + "b2dsZS5hcHBlbmdpbmUudjEuSW5zdGFuY2UuTGl2ZW5lc3MuTGl2ZW5lc3NT", + "dGF0ZUID4EEDGn8KCExpdmVuZXNzInMKDUxpdmVuZXNzU3RhdGUSHgoaTElW", + "RU5FU1NfU1RBVEVfVU5TUEVDSUZJRUQQABILCgdVTktOT1dOEAESCwoHSEVB", + "TFRIWRACEg0KCVVOSEVBTFRIWRADEgwKCERSQUlOSU5HEAQSCwoHVElNRU9V", + "VBAFIjoKDEF2YWlsYWJpbGl0eRIPCgtVTlNQRUNJRklFRBAAEgwKCFJFU0lE", + "RU5UEAESCwoHRFlOQU1JQxACOm3qQWoKIWFwcGVuZ2luZS5nb29nbGVhcGlz", + "LmNvbS9JbnN0YW5jZRJFYXBwcy97YXBwfS9zZXJ2aWNlcy97c2VydmljZX0v", + "dmVyc2lvbnMve3ZlcnNpb259L2luc3RhbmNlcy97aW5zdGFuY2V9Qr8BChdj", + "b20uZ29vZ2xlLmFwcGVuZ2luZS52MUINSW5zdGFuY2VQcm90b1ABWjxnb29n", + "bGUuZ29sYW5nLm9yZy9nZW5wcm90by9nb29nbGVhcGlzL2FwcGVuZ2luZS92", + "MTthcHBlbmdpbmWqAhlHb29nbGUuQ2xvdWQuQXBwRW5naW5lLlYxygIZR29v", + "Z2xlXENsb3VkXEFwcEVuZ2luZVxWMeoCHEdvb2dsZTo6Q2xvdWQ6OkFwcEVu", + "Z2luZTo6VjFiBnByb3RvMw==")); descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData, - new pbr::FileDescriptor[] { global::Google.Protobuf.WellKnownTypes.TimestampReflection.Descriptor, global::Google.Api.AnnotationsReflection.Descriptor, }, + new pbr::FileDescriptor[] { global::Google.Api.FieldBehaviorReflection.Descriptor, global::Google.Api.ResourceReflection.Descriptor, global::Google.Protobuf.WellKnownTypes.TimestampReflection.Descriptor, global::Google.Api.AnnotationsReflection.Descriptor, }, new pbr::GeneratedClrTypeInfo(null, null, new pbr::GeneratedClrTypeInfo[] { - new pbr::GeneratedClrTypeInfo(typeof(global::Google.Cloud.AppEngine.V1.Instance), global::Google.Cloud.AppEngine.V1.Instance.Parser, new[]{ "Name", "Id", "AppEngineRelease", "Availability", "VmName", "VmZoneName", "VmId", "StartTime", "Requests", "Errors", "Qps", "AverageLatency", "MemoryUsage", "VmStatus", "VmDebugEnabled", "VmIp" }, null, new[]{ typeof(global::Google.Cloud.AppEngine.V1.Instance.Types.Availability) }, null, null) + new pbr::GeneratedClrTypeInfo(typeof(global::Google.Cloud.AppEngine.V1.Instance), global::Google.Cloud.AppEngine.V1.Instance.Parser, new[]{ "Name", "Id", "AppEngineRelease", "Availability", "VmName", "VmZoneName", "VmId", "StartTime", "Requests", "Errors", "Qps", "AverageLatency", "MemoryUsage", "VmStatus", "VmDebugEnabled", "VmIp", "VmLiveness" }, null, new[]{ typeof(global::Google.Cloud.AppEngine.V1.Instance.Types.Availability) }, null, new pbr::GeneratedClrTypeInfo[] { new pbr::GeneratedClrTypeInfo(typeof(global::Google.Cloud.AppEngine.V1.Instance.Types.Liveness), global::Google.Cloud.AppEngine.V1.Instance.Types.Liveness.Parser, null, null, new[]{ typeof(global::Google.Cloud.AppEngine.V1.Instance.Types.Liveness.Types.LivenessState) }, null, null)}) })); } #endregion @@ -101,6 +111,7 @@ public sealed partial class Instance : pb::IMessage vmStatus_ = other.vmStatus_; vmDebugEnabled_ = other.vmDebugEnabled_; vmIp_ = other.vmIp_; + vmLiveness_ = other.vmLiveness_; _unknownFields = pb::UnknownFieldSet.Clone(other._unknownFields); } @@ -113,10 +124,8 @@ public sealed partial class Instance : pb::IMessage public const int NameFieldNumber = 1; private string name_ = ""; /// - /// Full path to the Instance resource in the API. + /// Output only. Full path to the Instance resource in the API. /// Example: `apps/myapp/services/default/versions/v1/instances/instance-1`. - /// - /// @OutputOnly /// [global::System.Diagnostics.DebuggerNonUserCodeAttribute] public string Name { @@ -130,10 +139,8 @@ public sealed partial class Instance : pb::IMessage public const int IdFieldNumber = 2; private string id_ = ""; /// - /// Relative name of the instance within the version. + /// Output only. Relative name of the instance within the version. /// Example: `instance-1`. - /// - /// @OutputOnly /// [global::System.Diagnostics.DebuggerNonUserCodeAttribute] public string Id { @@ -147,9 +154,7 @@ public sealed partial class Instance : pb::IMessage public const int AppEngineReleaseFieldNumber = 3; private string appEngineRelease_ = ""; /// - /// App Engine release this instance is running on. - /// - /// @OutputOnly + /// Output only. App Engine release this instance is running on. /// [global::System.Diagnostics.DebuggerNonUserCodeAttribute] public string AppEngineRelease { @@ -163,9 +168,7 @@ public sealed partial class Instance : pb::IMessage public const int AvailabilityFieldNumber = 4; private global::Google.Cloud.AppEngine.V1.Instance.Types.Availability availability_ = global::Google.Cloud.AppEngine.V1.Instance.Types.Availability.Unspecified; /// - /// Availability of the instance. - /// - /// @OutputOnly + /// Output only. Availability of the instance. /// [global::System.Diagnostics.DebuggerNonUserCodeAttribute] public global::Google.Cloud.AppEngine.V1.Instance.Types.Availability Availability { @@ -179,10 +182,8 @@ public sealed partial class Instance : pb::IMessage public const int VmNameFieldNumber = 5; private string vmName_ = ""; /// - /// Name of the virtual machine where this instance lives. Only applicable + /// Output only. Name of the virtual machine where this instance lives. Only applicable /// for instances in App Engine flexible environment. - /// - /// @OutputOnly /// [global::System.Diagnostics.DebuggerNonUserCodeAttribute] public string VmName { @@ -196,10 +197,8 @@ public sealed partial class Instance : pb::IMessage public const int VmZoneNameFieldNumber = 6; private string vmZoneName_ = ""; /// - /// Zone where the virtual machine is located. Only applicable for instances + /// Output only. Zone where the virtual machine is located. Only applicable for instances /// in App Engine flexible environment. - /// - /// @OutputOnly /// [global::System.Diagnostics.DebuggerNonUserCodeAttribute] public string VmZoneName { @@ -213,10 +212,8 @@ public sealed partial class Instance : pb::IMessage public const int VmIdFieldNumber = 7; private string vmId_ = ""; /// - /// Virtual machine ID of this instance. Only applicable for instances in + /// Output only. Virtual machine ID of this instance. Only applicable for instances in /// App Engine flexible environment. - /// - /// @OutputOnly /// [global::System.Diagnostics.DebuggerNonUserCodeAttribute] public string VmId { @@ -230,7 +227,7 @@ public sealed partial class Instance : pb::IMessage public const int StartTimeFieldNumber = 8; private global::Google.Protobuf.WellKnownTypes.Timestamp startTime_; /// - /// Time that this instance was started. + /// Output only. Time that this instance was started. /// /// @OutputOnly /// @@ -246,9 +243,7 @@ public sealed partial class Instance : pb::IMessage public const int RequestsFieldNumber = 9; private int requests_; /// - /// Number of requests since this instance was started. - /// - /// @OutputOnly + /// Output only. Number of requests since this instance was started. /// [global::System.Diagnostics.DebuggerNonUserCodeAttribute] public int Requests { @@ -262,9 +257,7 @@ public sealed partial class Instance : pb::IMessage public const int ErrorsFieldNumber = 10; private int errors_; /// - /// Number of errors since this instance was started. - /// - /// @OutputOnly + /// Output only. Number of errors since this instance was started. /// [global::System.Diagnostics.DebuggerNonUserCodeAttribute] public int Errors { @@ -278,9 +271,7 @@ public sealed partial class Instance : pb::IMessage public const int QpsFieldNumber = 11; private float qps_; /// - /// Average queries per second (QPS) over the last minute. - /// - /// @OutputOnly + /// Output only. Average queries per second (QPS) over the last minute. /// [global::System.Diagnostics.DebuggerNonUserCodeAttribute] public float Qps { @@ -294,9 +285,7 @@ public sealed partial class Instance : pb::IMessage public const int AverageLatencyFieldNumber = 12; private int averageLatency_; /// - /// Average latency (ms) over the last minute. - /// - /// @OutputOnly + /// Output only. Average latency (ms) over the last minute. /// [global::System.Diagnostics.DebuggerNonUserCodeAttribute] public int AverageLatency { @@ -310,9 +299,7 @@ public sealed partial class Instance : pb::IMessage public const int MemoryUsageFieldNumber = 13; private long memoryUsage_; /// - /// Total memory in use (bytes). - /// - /// @OutputOnly + /// Output only. Total memory in use (bytes). /// [global::System.Diagnostics.DebuggerNonUserCodeAttribute] public long MemoryUsage { @@ -326,10 +313,8 @@ public sealed partial class Instance : pb::IMessage public const int VmStatusFieldNumber = 14; private string vmStatus_ = ""; /// - /// Status of the virtual machine where this instance lives. Only applicable + /// Output only. Status of the virtual machine where this instance lives. Only applicable /// for instances in App Engine flexible environment. - /// - /// @OutputOnly /// [global::System.Diagnostics.DebuggerNonUserCodeAttribute] public string VmStatus { @@ -343,10 +328,8 @@ public sealed partial class Instance : pb::IMessage public const int VmDebugEnabledFieldNumber = 15; private bool vmDebugEnabled_; /// - /// Whether this instance is in debug mode. Only applicable for instances in + /// Output only. Whether this instance is in debug mode. Only applicable for instances in /// App Engine flexible environment. - /// - /// @OutputOnly /// [global::System.Diagnostics.DebuggerNonUserCodeAttribute] public bool VmDebugEnabled { @@ -360,10 +343,8 @@ public sealed partial class Instance : pb::IMessage public const int VmIpFieldNumber = 16; private string vmIp_ = ""; /// - /// The IP address of this instance. Only applicable for instances in App + /// Output only. The IP address of this instance. Only applicable for instances in App /// Engine flexible environment. - /// - /// @OutputOnly /// [global::System.Diagnostics.DebuggerNonUserCodeAttribute] public string VmIp { @@ -373,6 +354,21 @@ public sealed partial class Instance : pb::IMessage } } + /// Field number for the "vm_liveness" field. + public const int VmLivenessFieldNumber = 17; + private global::Google.Cloud.AppEngine.V1.Instance.Types.Liveness.Types.LivenessState vmLiveness_ = global::Google.Cloud.AppEngine.V1.Instance.Types.Liveness.Types.LivenessState.Unspecified; + /// + /// Output only. The liveness health check of this instance. Only applicable for instances + /// in App Engine flexible environment. + /// + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public global::Google.Cloud.AppEngine.V1.Instance.Types.Liveness.Types.LivenessState VmLiveness { + get { return vmLiveness_; } + set { + vmLiveness_ = value; + } + } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] public override bool Equals(object other) { return Equals(other as Instance); @@ -402,6 +398,7 @@ public sealed partial class Instance : pb::IMessage if (VmStatus != other.VmStatus) return false; if (VmDebugEnabled != other.VmDebugEnabled) return false; if (VmIp != other.VmIp) return false; + if (VmLiveness != other.VmLiveness) return false; return Equals(_unknownFields, other._unknownFields); } @@ -424,6 +421,7 @@ public sealed partial class Instance : pb::IMessage if (VmStatus.Length != 0) hash ^= VmStatus.GetHashCode(); if (VmDebugEnabled != false) hash ^= VmDebugEnabled.GetHashCode(); if (VmIp.Length != 0) hash ^= VmIp.GetHashCode(); + if (VmLiveness != global::Google.Cloud.AppEngine.V1.Instance.Types.Liveness.Types.LivenessState.Unspecified) hash ^= VmLiveness.GetHashCode(); if (_unknownFields != null) { hash ^= _unknownFields.GetHashCode(); } @@ -504,6 +502,10 @@ public sealed partial class Instance : pb::IMessage output.WriteRawTag(130, 1); output.WriteString(VmIp); } + if (VmLiveness != global::Google.Cloud.AppEngine.V1.Instance.Types.Liveness.Types.LivenessState.Unspecified) { + output.WriteRawTag(136, 1); + output.WriteEnum((int) VmLiveness); + } if (_unknownFields != null) { _unknownFields.WriteTo(output); } @@ -577,6 +579,10 @@ public sealed partial class Instance : pb::IMessage output.WriteRawTag(130, 1); output.WriteString(VmIp); } + if (VmLiveness != global::Google.Cloud.AppEngine.V1.Instance.Types.Liveness.Types.LivenessState.Unspecified) { + output.WriteRawTag(136, 1); + output.WriteEnum((int) VmLiveness); + } if (_unknownFields != null) { _unknownFields.WriteTo(ref output); } @@ -634,6 +640,9 @@ public sealed partial class Instance : pb::IMessage if (VmIp.Length != 0) { size += 2 + pb::CodedOutputStream.ComputeStringSize(VmIp); } + if (VmLiveness != global::Google.Cloud.AppEngine.V1.Instance.Types.Liveness.Types.LivenessState.Unspecified) { + size += 2 + pb::CodedOutputStream.ComputeEnumSize((int) VmLiveness); + } if (_unknownFields != null) { size += _unknownFields.CalculateSize(); } @@ -696,6 +705,9 @@ public sealed partial class Instance : pb::IMessage if (other.VmIp.Length != 0) { VmIp = other.VmIp; } + if (other.VmLiveness != global::Google.Cloud.AppEngine.V1.Instance.Types.Liveness.Types.LivenessState.Unspecified) { + VmLiveness = other.VmLiveness; + } _unknownFields = pb::UnknownFieldSet.MergeFrom(_unknownFields, other._unknownFields); } @@ -777,6 +789,10 @@ public sealed partial class Instance : pb::IMessage VmIp = input.ReadString(); break; } + case 136: { + VmLiveness = (global::Google.Cloud.AppEngine.V1.Instance.Types.Liveness.Types.LivenessState) input.ReadEnum(); + break; + } } } #endif @@ -858,6 +874,10 @@ public sealed partial class Instance : pb::IMessage VmIp = input.ReadString(); break; } + case 136: { + VmLiveness = (global::Google.Cloud.AppEngine.V1.Instance.Types.Liveness.Types.LivenessState) input.ReadEnum(); + break; + } } } } @@ -876,6 +896,190 @@ public enum Availability { [pbr::OriginalName("DYNAMIC")] Dynamic = 2, } + /// + /// Wrapper for LivenessState enum. + /// + public sealed partial class Liveness : pb::IMessage + #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE + , pb::IBufferMessage + #endif + { + private static readonly pb::MessageParser _parser = new pb::MessageParser(() => new Liveness()); + private pb::UnknownFieldSet _unknownFields; + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public static pb::MessageParser Parser { get { return _parser; } } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public static pbr::MessageDescriptor Descriptor { + get { return global::Google.Cloud.AppEngine.V1.Instance.Descriptor.NestedTypes[0]; } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + pbr::MessageDescriptor pb::IMessage.Descriptor { + get { return Descriptor; } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public Liveness() { + OnConstruction(); + } + + partial void OnConstruction(); + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public Liveness(Liveness other) : this() { + _unknownFields = pb::UnknownFieldSet.Clone(other._unknownFields); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public Liveness Clone() { + return new Liveness(this); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public override bool Equals(object other) { + return Equals(other as Liveness); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public bool Equals(Liveness other) { + if (ReferenceEquals(other, null)) { + return false; + } + if (ReferenceEquals(other, this)) { + return true; + } + return Equals(_unknownFields, other._unknownFields); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public override int GetHashCode() { + int hash = 1; + if (_unknownFields != null) { + hash ^= _unknownFields.GetHashCode(); + } + return hash; + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public override string ToString() { + return pb::JsonFormatter.ToDiagnosticString(this); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public void WriteTo(pb::CodedOutputStream output) { + #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE + output.WriteRawMessage(this); + #else + if (_unknownFields != null) { + _unknownFields.WriteTo(output); + } + #endif + } + + #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + void pb::IBufferMessage.InternalWriteTo(ref pb::WriteContext output) { + if (_unknownFields != null) { + _unknownFields.WriteTo(ref output); + } + } + #endif + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public int CalculateSize() { + int size = 0; + if (_unknownFields != null) { + size += _unknownFields.CalculateSize(); + } + return size; + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public void MergeFrom(Liveness other) { + if (other == null) { + return; + } + _unknownFields = pb::UnknownFieldSet.MergeFrom(_unknownFields, other._unknownFields); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public void MergeFrom(pb::CodedInputStream input) { + #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE + input.ReadRawMessage(this); + #else + uint tag; + while ((tag = input.ReadTag()) != 0) { + switch(tag) { + default: + _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input); + break; + } + } + #endif + } + + #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + void pb::IBufferMessage.InternalMergeFrom(ref pb::ParseContext input) { + uint tag; + while ((tag = input.ReadTag()) != 0) { + switch(tag) { + default: + _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, ref input); + break; + } + } + } + #endif + + #region Nested types + /// Container for nested types declared in the Liveness message type. + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public static partial class Types { + /// + /// Liveness health check status for Flex instances. + /// + public enum LivenessState { + /// + /// There is no liveness health check for the instance. Only applicable for + /// instances in App Engine standard environment. + /// + [pbr::OriginalName("LIVENESS_STATE_UNSPECIFIED")] Unspecified = 0, + /// + /// The health checking system is aware of the instance but its health is + /// not known at the moment. + /// + [pbr::OriginalName("UNKNOWN")] Unknown = 1, + /// + /// The instance is reachable i.e. a connection to the application health + /// checking endpoint can be established, and conforms to the requirements + /// defined by the health check. + /// + [pbr::OriginalName("HEALTHY")] Healthy = 2, + /// + /// The instance is reachable, but does not conform to the requirements + /// defined by the health check. + /// + [pbr::OriginalName("UNHEALTHY")] Unhealthy = 3, + /// + /// The instance is being drained. The existing connections to the instance + /// have time to complete, but the new ones are being refused. + /// + [pbr::OriginalName("DRAINING")] Draining = 4, + /// + /// The instance is unreachable i.e. a connection to the application health + /// checking endpoint cannot be established, or the server does not respond + /// within the specified timeout. + /// + [pbr::OriginalName("TIMEOUT")] Timeout = 5, + } + + } + #endregion + + } + } #endregion diff --git a/apis/Google.Cloud.AppEngine.V1/Google.Cloud.AppEngine.V1/InstanceResourceNames.g.cs b/apis/Google.Cloud.AppEngine.V1/Google.Cloud.AppEngine.V1/InstanceResourceNames.g.cs new file mode 100644 index 000000000000..e65557fd1cf4 --- /dev/null +++ b/apis/Google.Cloud.AppEngine.V1/Google.Cloud.AppEngine.V1/InstanceResourceNames.g.cs @@ -0,0 +1,283 @@ +// Copyright 2021 Google LLC +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// https://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +// Generated code. DO NOT EDIT! + +using gax = Google.Api.Gax; +using gcav = Google.Cloud.AppEngine.V1; +using sys = System; + +namespace Google.Cloud.AppEngine.V1 +{ + /// Resource name for the Instance resource. + public sealed partial class InstanceName : gax::IResourceName, sys::IEquatable + { + /// The possible contents of . + public enum ResourceNameType + { + /// An unparsed resource name. + Unparsed = 0, + + /// + /// A resource name with pattern apps/{app}/services/{service}/versions/{version}/instances/{instance} + /// . + /// + AppServiceVersionInstance = 1, + } + + private static gax::PathTemplate s_appServiceVersionInstance = new gax::PathTemplate("apps/{app}/services/{service}/versions/{version}/instances/{instance}"); + + /// Creates a containing an unparsed resource name. + /// The unparsed resource name. Must not be null. + /// + /// A new instance of containing the provided + /// . + /// + public static InstanceName FromUnparsed(gax::UnparsedResourceName unparsedResourceName) => + new InstanceName(ResourceNameType.Unparsed, gax::GaxPreconditions.CheckNotNull(unparsedResourceName, nameof(unparsedResourceName))); + + /// + /// Creates a with the pattern + /// apps/{app}/services/{service}/versions/{version}/instances/{instance}. + /// + /// The App ID. Must not be null or empty. + /// The Service ID. Must not be null or empty. + /// The Version ID. Must not be null or empty. + /// The Instance ID. Must not be null or empty. + /// A new instance of constructed from the provided ids. + public static InstanceName FromAppServiceVersionInstance(string appId, string serviceId, string versionId, string instanceId) => + new InstanceName(ResourceNameType.AppServiceVersionInstance, appId: gax::GaxPreconditions.CheckNotNullOrEmpty(appId, nameof(appId)), serviceId: gax::GaxPreconditions.CheckNotNullOrEmpty(serviceId, nameof(serviceId)), versionId: gax::GaxPreconditions.CheckNotNullOrEmpty(versionId, nameof(versionId)), instanceId: gax::GaxPreconditions.CheckNotNullOrEmpty(instanceId, nameof(instanceId))); + + /// + /// Formats the IDs into the string representation of this with pattern + /// apps/{app}/services/{service}/versions/{version}/instances/{instance}. + /// + /// The App ID. Must not be null or empty. + /// The Service ID. Must not be null or empty. + /// The Version ID. Must not be null or empty. + /// The Instance ID. Must not be null or empty. + /// + /// The string representation of this with pattern + /// apps/{app}/services/{service}/versions/{version}/instances/{instance}. + /// + public static string Format(string appId, string serviceId, string versionId, string instanceId) => + FormatAppServiceVersionInstance(appId, serviceId, versionId, instanceId); + + /// + /// Formats the IDs into the string representation of this with pattern + /// apps/{app}/services/{service}/versions/{version}/instances/{instance}. + /// + /// The App ID. Must not be null or empty. + /// The Service ID. Must not be null or empty. + /// The Version ID. Must not be null or empty. + /// The Instance ID. Must not be null or empty. + /// + /// The string representation of this with pattern + /// apps/{app}/services/{service}/versions/{version}/instances/{instance}. + /// + public static string FormatAppServiceVersionInstance(string appId, string serviceId, string versionId, string instanceId) => + s_appServiceVersionInstance.Expand(gax::GaxPreconditions.CheckNotNullOrEmpty(appId, nameof(appId)), gax::GaxPreconditions.CheckNotNullOrEmpty(serviceId, nameof(serviceId)), gax::GaxPreconditions.CheckNotNullOrEmpty(versionId, nameof(versionId)), gax::GaxPreconditions.CheckNotNullOrEmpty(instanceId, nameof(instanceId))); + + /// Parses the given resource name string into a new instance. + /// + /// To parse successfully, the resource name must be formatted as one of the following: + /// + /// + /// apps/{app}/services/{service}/versions/{version}/instances/{instance} + /// + /// + /// + /// The resource name in string form. Must not be null. + /// The parsed if successful. + public static InstanceName Parse(string instanceName) => Parse(instanceName, false); + + /// + /// Parses the given resource name string into a new instance; optionally allowing an + /// unparseable resource name. + /// + /// + /// To parse successfully, the resource name must be formatted as one of the following: + /// + /// + /// apps/{app}/services/{service}/versions/{version}/instances/{instance} + /// + /// + /// Or may be in any format if is true. + /// + /// The resource name in string form. Must not be null. + /// + /// If true will successfully store an unparseable resource name into the + /// property; otherwise will throw an if an unparseable resource name is + /// specified. + /// + /// The parsed if successful. + public static InstanceName Parse(string instanceName, bool allowUnparsed) => + TryParse(instanceName, allowUnparsed, out InstanceName result) ? result : throw new sys::ArgumentException("The given resource-name matches no pattern."); + + /// + /// Tries to parse the given resource name string into a new instance. + /// + /// + /// To parse successfully, the resource name must be formatted as one of the following: + /// + /// + /// apps/{app}/services/{service}/versions/{version}/instances/{instance} + /// + /// + /// + /// The resource name in string form. Must not be null. + /// + /// When this method returns, the parsed , or null if parsing failed. + /// + /// true if the name was parsed successfully; false otherwise. + public static bool TryParse(string instanceName, out InstanceName result) => TryParse(instanceName, false, out result); + + /// + /// Tries to parse the given resource name string into a new instance; optionally + /// allowing an unparseable resource name. + /// + /// + /// To parse successfully, the resource name must be formatted as one of the following: + /// + /// + /// apps/{app}/services/{service}/versions/{version}/instances/{instance} + /// + /// + /// Or may be in any format if is true. + /// + /// The resource name in string form. Must not be null. + /// + /// If true will successfully store an unparseable resource name into the + /// property; otherwise will throw an if an unparseable resource name is + /// specified. + /// + /// + /// When this method returns, the parsed , or null if parsing failed. + /// + /// true if the name was parsed successfully; false otherwise. + public static bool TryParse(string instanceName, bool allowUnparsed, out InstanceName result) + { + gax::GaxPreconditions.CheckNotNull(instanceName, nameof(instanceName)); + gax::TemplatedResourceName resourceName; + if (s_appServiceVersionInstance.TryParseName(instanceName, out resourceName)) + { + result = FromAppServiceVersionInstance(resourceName[0], resourceName[1], resourceName[2], resourceName[3]); + return true; + } + if (allowUnparsed) + { + if (gax::UnparsedResourceName.TryParse(instanceName, out gax::UnparsedResourceName unparsedResourceName)) + { + result = FromUnparsed(unparsedResourceName); + return true; + } + } + result = null; + return false; + } + + private InstanceName(ResourceNameType type, gax::UnparsedResourceName unparsedResourceName = null, string appId = null, string instanceId = null, string serviceId = null, string versionId = null) + { + Type = type; + UnparsedResource = unparsedResourceName; + AppId = appId; + InstanceId = instanceId; + ServiceId = serviceId; + VersionId = versionId; + } + + /// + /// Constructs a new instance of a class from the component parts of pattern + /// apps/{app}/services/{service}/versions/{version}/instances/{instance} + /// + /// The App ID. Must not be null or empty. + /// The Service ID. Must not be null or empty. + /// The Version ID. Must not be null or empty. + /// The Instance ID. Must not be null or empty. + public InstanceName(string appId, string serviceId, string versionId, string instanceId) : this(ResourceNameType.AppServiceVersionInstance, appId: gax::GaxPreconditions.CheckNotNullOrEmpty(appId, nameof(appId)), serviceId: gax::GaxPreconditions.CheckNotNullOrEmpty(serviceId, nameof(serviceId)), versionId: gax::GaxPreconditions.CheckNotNullOrEmpty(versionId, nameof(versionId)), instanceId: gax::GaxPreconditions.CheckNotNullOrEmpty(instanceId, nameof(instanceId))) + { + } + + /// The of the contained resource name. + public ResourceNameType Type { get; } + + /// + /// The contained . Only non-null if this instance contains an + /// unparsed resource name. + /// + public gax::UnparsedResourceName UnparsedResource { get; } + + /// + /// The App ID. Will not be null, unless this instance contains an unparsed resource name. + /// + public string AppId { get; } + + /// + /// The Instance ID. Will not be null, unless this instance contains an unparsed resource name. + /// + public string InstanceId { get; } + + /// + /// The Service ID. Will not be null, unless this instance contains an unparsed resource name. + /// + public string ServiceId { get; } + + /// + /// The Version ID. Will not be null, unless this instance contains an unparsed resource name. + /// + public string VersionId { get; } + + /// Whether this instance contains a resource name with a known pattern. + public bool IsKnownPattern => Type != ResourceNameType.Unparsed; + + /// The string representation of the resource name. + /// The string representation of the resource name. + public override string ToString() + { + switch (Type) + { + case ResourceNameType.Unparsed: return UnparsedResource.ToString(); + case ResourceNameType.AppServiceVersionInstance: return s_appServiceVersionInstance.Expand(AppId, ServiceId, VersionId, InstanceId); + default: throw new sys::InvalidOperationException("Unrecognized resource-type."); + } + } + + /// Returns a hash code for this resource name. + public override int GetHashCode() => ToString().GetHashCode(); + + /// + public override bool Equals(object obj) => Equals(obj as InstanceName); + + /// + public bool Equals(InstanceName other) => ToString() == other?.ToString(); + + /// + public static bool operator ==(InstanceName a, InstanceName b) => ReferenceEquals(a, b) || (a?.Equals(b) ?? false); + + /// + public static bool operator !=(InstanceName a, InstanceName b) => !(a == b); + } + + public partial class Instance + { + /// + /// -typed view over the resource name property. + /// + public gcav::InstanceName InstanceName + { + get => string.IsNullOrEmpty(Name) ? null : gcav::InstanceName.Parse(Name, allowUnparsed: true); + set => Name = value?.ToString() ?? ""; + } + } +} diff --git a/apis/Google.Cloud.AppEngine.V1/Google.Cloud.AppEngine.V1/InstancesClient.g.cs b/apis/Google.Cloud.AppEngine.V1/Google.Cloud.AppEngine.V1/InstancesClient.g.cs index c9031c4c08e5..a9d3c35633e1 100644 --- a/apis/Google.Cloud.AppEngine.V1/Google.Cloud.AppEngine.V1/InstancesClient.g.cs +++ b/apis/Google.Cloud.AppEngine.V1/Google.Cloud.AppEngine.V1/InstancesClient.g.cs @@ -64,10 +64,10 @@ private InstancesSettings(InstancesSettings existing) : base(existing) /// /// /// This call will not be retried. - /// No timeout is applied. + /// Timeout: 60 seconds. /// /// - public gaxgrpc::CallSettings ListInstancesSettings { get; set; } = gaxgrpc::CallSettings.FromExpiration(gax::Expiration.None); + public gaxgrpc::CallSettings ListInstancesSettings { get; set; } = gaxgrpc::CallSettings.FromExpiration(gax::Expiration.FromTimeout(sys::TimeSpan.FromMilliseconds(60000))); /// /// for synchronous and asynchronous calls to InstancesClient.GetInstance @@ -76,10 +76,10 @@ private InstancesSettings(InstancesSettings existing) : base(existing) /// /// /// This call will not be retried. - /// No timeout is applied. + /// Timeout: 60 seconds. /// /// - public gaxgrpc::CallSettings GetInstanceSettings { get; set; } = gaxgrpc::CallSettings.FromExpiration(gax::Expiration.None); + public gaxgrpc::CallSettings GetInstanceSettings { get; set; } = gaxgrpc::CallSettings.FromExpiration(gax::Expiration.FromTimeout(sys::TimeSpan.FromMilliseconds(60000))); /// /// for synchronous and asynchronous calls to @@ -88,10 +88,10 @@ private InstancesSettings(InstancesSettings existing) : base(existing) /// /// /// This call will not be retried. - /// No timeout is applied. + /// Timeout: 60 seconds. /// /// - public gaxgrpc::CallSettings DeleteInstanceSettings { get; set; } = gaxgrpc::CallSettings.FromExpiration(gax::Expiration.None); + public gaxgrpc::CallSettings DeleteInstanceSettings { get; set; } = gaxgrpc::CallSettings.FromExpiration(gax::Expiration.FromTimeout(sys::TimeSpan.FromMilliseconds(60000))); /// /// Long Running Operation settings for calls to InstancesClient.DeleteInstance and @@ -118,10 +118,10 @@ private InstancesSettings(InstancesSettings existing) : base(existing) /// /// /// This call will not be retried. - /// No timeout is applied. + /// Timeout: 60 seconds. /// /// - public gaxgrpc::CallSettings DebugInstanceSettings { get; set; } = gaxgrpc::CallSettings.FromExpiration(gax::Expiration.None); + public gaxgrpc::CallSettings DebugInstanceSettings { get; set; } = gaxgrpc::CallSettings.FromExpiration(gax::Expiration.FromTimeout(sys::TimeSpan.FromMilliseconds(60000))); /// /// Long Running Operation settings for calls to InstancesClient.DebugInstance and diff --git a/apis/Google.Cloud.AppEngine.V1/Google.Cloud.AppEngine.V1/Location.cs b/apis/Google.Cloud.AppEngine.V1/Google.Cloud.AppEngine.V1/Location.cs index f40427e62eca..282d1c50dda2 100644 --- a/apis/Google.Cloud.AppEngine.V1/Google.Cloud.AppEngine.V1/Location.cs +++ b/apis/Google.Cloud.AppEngine.V1/Google.Cloud.AppEngine.V1/Location.cs @@ -25,18 +25,20 @@ public static partial class LocationReflection { byte[] descriptorData = global::System.Convert.FromBase64String( string.Concat( "CiJnb29nbGUvYXBwZW5naW5lL3YxL2xvY2F0aW9uLnByb3RvEhNnb29nbGUu", - "YXBwZW5naW5lLnYxGhxnb29nbGUvYXBpL2Fubm90YXRpb25zLnByb3RvImIK", - "EExvY2F0aW9uTWV0YWRhdGESJgoec3RhbmRhcmRfZW52aXJvbm1lbnRfYXZh", - "aWxhYmxlGAIgASgIEiYKHmZsZXhpYmxlX2Vudmlyb25tZW50X2F2YWlsYWJs", - "ZRgEIAEoCEK/AQoXY29tLmdvb2dsZS5hcHBlbmdpbmUudjFCDUxvY2F0aW9u", - "UHJvdG9QAVo8Z29vZ2xlLmdvbGFuZy5vcmcvZ2VucHJvdG8vZ29vZ2xlYXBp", - "cy9hcHBlbmdpbmUvdjE7YXBwZW5naW5lqgIZR29vZ2xlLkNsb3VkLkFwcEVu", - "Z2luZS5WMcoCGUdvb2dsZVxDbG91ZFxBcHBFbmdpbmVcVjHqAhxHb29nbGU6", - "OkNsb3VkOjpBcHBFbmdpbmU6OlYxYgZwcm90bzM=")); + "YXBwZW5naW5lLnYxGh9nb29nbGUvYXBpL2ZpZWxkX2JlaGF2aW9yLnByb3Rv", + "Ghxnb29nbGUvYXBpL2Fubm90YXRpb25zLnByb3RvIoUBChBMb2NhdGlvbk1l", + "dGFkYXRhEiYKHnN0YW5kYXJkX2Vudmlyb25tZW50X2F2YWlsYWJsZRgCIAEo", + "CBImCh5mbGV4aWJsZV9lbnZpcm9ubWVudF9hdmFpbGFibGUYBCABKAgSIQoU", + "c2VhcmNoX2FwaV9hdmFpbGFibGUYBiABKAhCA+BBA0K/AQoXY29tLmdvb2ds", + "ZS5hcHBlbmdpbmUudjFCDUxvY2F0aW9uUHJvdG9QAVo8Z29vZ2xlLmdvbGFu", + "Zy5vcmcvZ2VucHJvdG8vZ29vZ2xlYXBpcy9hcHBlbmdpbmUvdjE7YXBwZW5n", + "aW5lqgIZR29vZ2xlLkNsb3VkLkFwcEVuZ2luZS5WMcoCGUdvb2dsZVxDbG91", + "ZFxBcHBFbmdpbmVcVjHqAhxHb29nbGU6OkNsb3VkOjpBcHBFbmdpbmU6OlYx", + "YgZwcm90bzM=")); descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData, - new pbr::FileDescriptor[] { global::Google.Api.AnnotationsReflection.Descriptor, }, + new pbr::FileDescriptor[] { global::Google.Api.FieldBehaviorReflection.Descriptor, global::Google.Api.AnnotationsReflection.Descriptor, }, new pbr::GeneratedClrTypeInfo(null, null, new pbr::GeneratedClrTypeInfo[] { - new pbr::GeneratedClrTypeInfo(typeof(global::Google.Cloud.AppEngine.V1.LocationMetadata), global::Google.Cloud.AppEngine.V1.LocationMetadata.Parser, new[]{ "StandardEnvironmentAvailable", "FlexibleEnvironmentAvailable" }, null, null, null, null) + new pbr::GeneratedClrTypeInfo(typeof(global::Google.Cloud.AppEngine.V1.LocationMetadata), global::Google.Cloud.AppEngine.V1.LocationMetadata.Parser, new[]{ "StandardEnvironmentAvailable", "FlexibleEnvironmentAvailable", "SearchApiAvailable" }, null, null, null, null) })); } #endregion @@ -77,6 +79,7 @@ public sealed partial class LocationMetadata : pb::IMessage public LocationMetadata(LocationMetadata other) : this() { standardEnvironmentAvailable_ = other.standardEnvironmentAvailable_; flexibleEnvironmentAvailable_ = other.flexibleEnvironmentAvailable_; + searchApiAvailable_ = other.searchApiAvailable_; _unknownFields = pb::UnknownFieldSet.Clone(other._unknownFields); } @@ -117,6 +120,21 @@ public sealed partial class LocationMetadata : pb::IMessage } } + /// Field number for the "search_api_available" field. + public const int SearchApiAvailableFieldNumber = 6; + private bool searchApiAvailable_; + /// + /// Output only. [Search API](https://cloud.google.com/appengine/docs/standard/python/search) + /// is available in the given location. + /// + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public bool SearchApiAvailable { + get { return searchApiAvailable_; } + set { + searchApiAvailable_ = value; + } + } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] public override bool Equals(object other) { return Equals(other as LocationMetadata); @@ -132,6 +150,7 @@ public sealed partial class LocationMetadata : pb::IMessage } if (StandardEnvironmentAvailable != other.StandardEnvironmentAvailable) return false; if (FlexibleEnvironmentAvailable != other.FlexibleEnvironmentAvailable) return false; + if (SearchApiAvailable != other.SearchApiAvailable) return false; return Equals(_unknownFields, other._unknownFields); } @@ -140,6 +159,7 @@ public sealed partial class LocationMetadata : pb::IMessage int hash = 1; if (StandardEnvironmentAvailable != false) hash ^= StandardEnvironmentAvailable.GetHashCode(); if (FlexibleEnvironmentAvailable != false) hash ^= FlexibleEnvironmentAvailable.GetHashCode(); + if (SearchApiAvailable != false) hash ^= SearchApiAvailable.GetHashCode(); if (_unknownFields != null) { hash ^= _unknownFields.GetHashCode(); } @@ -164,6 +184,10 @@ public sealed partial class LocationMetadata : pb::IMessage output.WriteRawTag(32); output.WriteBool(FlexibleEnvironmentAvailable); } + if (SearchApiAvailable != false) { + output.WriteRawTag(48); + output.WriteBool(SearchApiAvailable); + } if (_unknownFields != null) { _unknownFields.WriteTo(output); } @@ -181,6 +205,10 @@ public sealed partial class LocationMetadata : pb::IMessage output.WriteRawTag(32); output.WriteBool(FlexibleEnvironmentAvailable); } + if (SearchApiAvailable != false) { + output.WriteRawTag(48); + output.WriteBool(SearchApiAvailable); + } if (_unknownFields != null) { _unknownFields.WriteTo(ref output); } @@ -196,6 +224,9 @@ public sealed partial class LocationMetadata : pb::IMessage if (FlexibleEnvironmentAvailable != false) { size += 1 + 1; } + if (SearchApiAvailable != false) { + size += 1 + 1; + } if (_unknownFields != null) { size += _unknownFields.CalculateSize(); } @@ -213,6 +244,9 @@ public sealed partial class LocationMetadata : pb::IMessage if (other.FlexibleEnvironmentAvailable != false) { FlexibleEnvironmentAvailable = other.FlexibleEnvironmentAvailable; } + if (other.SearchApiAvailable != false) { + SearchApiAvailable = other.SearchApiAvailable; + } _unknownFields = pb::UnknownFieldSet.MergeFrom(_unknownFields, other._unknownFields); } @@ -235,6 +269,10 @@ public sealed partial class LocationMetadata : pb::IMessage FlexibleEnvironmentAvailable = input.ReadBool(); break; } + case 48: { + SearchApiAvailable = input.ReadBool(); + break; + } } } #endif @@ -257,6 +295,10 @@ public sealed partial class LocationMetadata : pb::IMessage FlexibleEnvironmentAvailable = input.ReadBool(); break; } + case 48: { + SearchApiAvailable = input.ReadBool(); + break; + } } } } diff --git a/apis/Google.Cloud.AppEngine.V1/Google.Cloud.AppEngine.V1/NetworkSettings.cs b/apis/Google.Cloud.AppEngine.V1/Google.Cloud.AppEngine.V1/NetworkSettings.cs index 8e6332ce47ad..f9252315777a 100644 --- a/apis/Google.Cloud.AppEngine.V1/Google.Cloud.AppEngine.V1/NetworkSettings.cs +++ b/apis/Google.Cloud.AppEngine.V1/Google.Cloud.AppEngine.V1/NetworkSettings.cs @@ -26,18 +26,238 @@ public static partial class NetworkSettingsReflection { string.Concat( "Cipnb29nbGUvYXBwZW5naW5lL3YxL25ldHdvcmtfc2V0dGluZ3MucHJvdG8S", "E2dvb2dsZS5hcHBlbmdpbmUudjEaHGdvb2dsZS9hcGkvYW5ub3RhdGlvbnMu", - "cHJvdG9CxgEKF2NvbS5nb29nbGUuYXBwZW5naW5lLnYxQhROZXR3b3JrU2V0", - "dGluZ3NQcm90b1ABWjxnb29nbGUuZ29sYW5nLm9yZy9nZW5wcm90by9nb29n", - "bGVhcGlzL2FwcGVuZ2luZS92MTthcHBlbmdpbmWqAhlHb29nbGUuQ2xvdWQu", - "QXBwRW5naW5lLlYxygIZR29vZ2xlXENsb3VkXEFwcEVuZ2luZVxWMeoCHEdv", - "b2dsZTo6Q2xvdWQ6OkFwcEVuZ2luZTo6VjFiBnByb3RvMw==")); + "cHJvdG8iqgIKD05ldHdvcmtTZXR0aW5ncxJbChdpbmdyZXNzX3RyYWZmaWNf", + "YWxsb3dlZBgBIAEoDjI6Lmdvb2dsZS5hcHBlbmdpbmUudjEuTmV0d29ya1Nl", + "dHRpbmdzLkluZ3Jlc3NUcmFmZmljQWxsb3dlZCK5AQoVSW5ncmVzc1RyYWZm", + "aWNBbGxvd2VkEicKI0lOR1JFU1NfVFJBRkZJQ19BTExPV0VEX1VOU1BFQ0lG", + "SUVEEAASHwobSU5HUkVTU19UUkFGRklDX0FMTE9XRURfQUxMEAESKQolSU5H", + "UkVTU19UUkFGRklDX0FMTE9XRURfSU5URVJOQUxfT05MWRACEisKJ0lOR1JF", + "U1NfVFJBRkZJQ19BTExPV0VEX0lOVEVSTkFMX0FORF9MQhADQsYBChdjb20u", + "Z29vZ2xlLmFwcGVuZ2luZS52MUIUTmV0d29ya1NldHRpbmdzUHJvdG9QAVo8", + "Z29vZ2xlLmdvbGFuZy5vcmcvZ2VucHJvdG8vZ29vZ2xlYXBpcy9hcHBlbmdp", + "bmUvdjE7YXBwZW5naW5lqgIZR29vZ2xlLkNsb3VkLkFwcEVuZ2luZS5WMcoC", + "GUdvb2dsZVxDbG91ZFxBcHBFbmdpbmVcVjHqAhxHb29nbGU6OkNsb3VkOjpB", + "cHBFbmdpbmU6OlYxYgZwcm90bzM=")); descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData, new pbr::FileDescriptor[] { global::Google.Api.AnnotationsReflection.Descriptor, }, - new pbr::GeneratedClrTypeInfo(null, null, null)); + new pbr::GeneratedClrTypeInfo(null, null, new pbr::GeneratedClrTypeInfo[] { + new pbr::GeneratedClrTypeInfo(typeof(global::Google.Cloud.AppEngine.V1.NetworkSettings), global::Google.Cloud.AppEngine.V1.NetworkSettings.Parser, new[]{ "IngressTrafficAllowed" }, null, new[]{ typeof(global::Google.Cloud.AppEngine.V1.NetworkSettings.Types.IngressTrafficAllowed) }, null, null) + })); } #endregion } + #region Messages + /// + /// A NetworkSettings resource is a container for ingress settings for a version + /// or service. + /// + public sealed partial class NetworkSettings : pb::IMessage + #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE + , pb::IBufferMessage + #endif + { + private static readonly pb::MessageParser _parser = new pb::MessageParser(() => new NetworkSettings()); + private pb::UnknownFieldSet _unknownFields; + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public static pb::MessageParser Parser { get { return _parser; } } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public static pbr::MessageDescriptor Descriptor { + get { return global::Google.Cloud.AppEngine.V1.NetworkSettingsReflection.Descriptor.MessageTypes[0]; } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + pbr::MessageDescriptor pb::IMessage.Descriptor { + get { return Descriptor; } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public NetworkSettings() { + OnConstruction(); + } + + partial void OnConstruction(); + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public NetworkSettings(NetworkSettings other) : this() { + ingressTrafficAllowed_ = other.ingressTrafficAllowed_; + _unknownFields = pb::UnknownFieldSet.Clone(other._unknownFields); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public NetworkSettings Clone() { + return new NetworkSettings(this); + } + + /// Field number for the "ingress_traffic_allowed" field. + public const int IngressTrafficAllowedFieldNumber = 1; + private global::Google.Cloud.AppEngine.V1.NetworkSettings.Types.IngressTrafficAllowed ingressTrafficAllowed_ = global::Google.Cloud.AppEngine.V1.NetworkSettings.Types.IngressTrafficAllowed.Unspecified; + /// + /// The ingress settings for version or service. + /// + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public global::Google.Cloud.AppEngine.V1.NetworkSettings.Types.IngressTrafficAllowed IngressTrafficAllowed { + get { return ingressTrafficAllowed_; } + set { + ingressTrafficAllowed_ = value; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public override bool Equals(object other) { + return Equals(other as NetworkSettings); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public bool Equals(NetworkSettings other) { + if (ReferenceEquals(other, null)) { + return false; + } + if (ReferenceEquals(other, this)) { + return true; + } + if (IngressTrafficAllowed != other.IngressTrafficAllowed) return false; + return Equals(_unknownFields, other._unknownFields); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public override int GetHashCode() { + int hash = 1; + if (IngressTrafficAllowed != global::Google.Cloud.AppEngine.V1.NetworkSettings.Types.IngressTrafficAllowed.Unspecified) hash ^= IngressTrafficAllowed.GetHashCode(); + if (_unknownFields != null) { + hash ^= _unknownFields.GetHashCode(); + } + return hash; + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public override string ToString() { + return pb::JsonFormatter.ToDiagnosticString(this); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public void WriteTo(pb::CodedOutputStream output) { + #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE + output.WriteRawMessage(this); + #else + if (IngressTrafficAllowed != global::Google.Cloud.AppEngine.V1.NetworkSettings.Types.IngressTrafficAllowed.Unspecified) { + output.WriteRawTag(8); + output.WriteEnum((int) IngressTrafficAllowed); + } + if (_unknownFields != null) { + _unknownFields.WriteTo(output); + } + #endif + } + + #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + void pb::IBufferMessage.InternalWriteTo(ref pb::WriteContext output) { + if (IngressTrafficAllowed != global::Google.Cloud.AppEngine.V1.NetworkSettings.Types.IngressTrafficAllowed.Unspecified) { + output.WriteRawTag(8); + output.WriteEnum((int) IngressTrafficAllowed); + } + if (_unknownFields != null) { + _unknownFields.WriteTo(ref output); + } + } + #endif + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public int CalculateSize() { + int size = 0; + if (IngressTrafficAllowed != global::Google.Cloud.AppEngine.V1.NetworkSettings.Types.IngressTrafficAllowed.Unspecified) { + size += 1 + pb::CodedOutputStream.ComputeEnumSize((int) IngressTrafficAllowed); + } + if (_unknownFields != null) { + size += _unknownFields.CalculateSize(); + } + return size; + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public void MergeFrom(NetworkSettings other) { + if (other == null) { + return; + } + if (other.IngressTrafficAllowed != global::Google.Cloud.AppEngine.V1.NetworkSettings.Types.IngressTrafficAllowed.Unspecified) { + IngressTrafficAllowed = other.IngressTrafficAllowed; + } + _unknownFields = pb::UnknownFieldSet.MergeFrom(_unknownFields, other._unknownFields); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public void MergeFrom(pb::CodedInputStream input) { + #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE + input.ReadRawMessage(this); + #else + uint tag; + while ((tag = input.ReadTag()) != 0) { + switch(tag) { + default: + _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input); + break; + case 8: { + IngressTrafficAllowed = (global::Google.Cloud.AppEngine.V1.NetworkSettings.Types.IngressTrafficAllowed) input.ReadEnum(); + break; + } + } + } + #endif + } + + #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + void pb::IBufferMessage.InternalMergeFrom(ref pb::ParseContext input) { + uint tag; + while ((tag = input.ReadTag()) != 0) { + switch(tag) { + default: + _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, ref input); + break; + case 8: { + IngressTrafficAllowed = (global::Google.Cloud.AppEngine.V1.NetworkSettings.Types.IngressTrafficAllowed) input.ReadEnum(); + break; + } + } + } + } + #endif + + #region Nested types + /// Container for nested types declared in the NetworkSettings message type. + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public static partial class Types { + /// + /// If unspecified, INGRESS_TRAFFIC_ALLOWED_ALL will be used. + /// + public enum IngressTrafficAllowed { + /// + /// Unspecified + /// + [pbr::OriginalName("INGRESS_TRAFFIC_ALLOWED_UNSPECIFIED")] Unspecified = 0, + /// + /// Allow HTTP traffic from public and private sources. + /// + [pbr::OriginalName("INGRESS_TRAFFIC_ALLOWED_ALL")] All = 1, + /// + /// Allow HTTP traffic from only private VPC sources. + /// + [pbr::OriginalName("INGRESS_TRAFFIC_ALLOWED_INTERNAL_ONLY")] InternalOnly = 2, + /// + /// Allow HTTP traffic from private VPC sources and through load balancers. + /// + [pbr::OriginalName("INGRESS_TRAFFIC_ALLOWED_INTERNAL_AND_LB")] InternalAndLb = 3, + } + + } + #endregion + + } + + #endregion + } #endregion Designer generated code diff --git a/apis/Google.Cloud.AppEngine.V1/Google.Cloud.AppEngine.V1/Operation.cs b/apis/Google.Cloud.AppEngine.V1/Google.Cloud.AppEngine.V1/Operation.cs index 0b98a32795de..ce445bce29e1 100644 --- a/apis/Google.Cloud.AppEngine.V1/Google.Cloud.AppEngine.V1/Operation.cs +++ b/apis/Google.Cloud.AppEngine.V1/Google.Cloud.AppEngine.V1/Operation.cs @@ -25,23 +25,23 @@ public static partial class OperationReflection { byte[] descriptorData = global::System.Convert.FromBase64String( string.Concat( "CiNnb29nbGUvYXBwZW5naW5lL3YxL29wZXJhdGlvbi5wcm90bxITZ29vZ2xl", - "LmFwcGVuZ2luZS52MRofZ29vZ2xlL3Byb3RvYnVmL3RpbWVzdGFtcC5wcm90", - "bxocZ29vZ2xlL2FwaS9hbm5vdGF0aW9ucy5wcm90byKyAgoTT3BlcmF0aW9u", - "TWV0YWRhdGFWMRIOCgZtZXRob2QYASABKAkSLwoLaW5zZXJ0X3RpbWUYAiAB", - "KAsyGi5nb29nbGUucHJvdG9idWYuVGltZXN0YW1wEiwKCGVuZF90aW1lGAMg", - "ASgLMhouZ29vZ2xlLnByb3RvYnVmLlRpbWVzdGFtcBIMCgR1c2VyGAQgASgJ", - "Eg4KBnRhcmdldBgFIAEoCRIZChFlcGhlbWVyYWxfbWVzc2FnZRgGIAEoCRIP", - "Cgd3YXJuaW5nGAcgAygJEk8KF2NyZWF0ZV92ZXJzaW9uX21ldGFkYXRhGAgg", - "ASgLMiwuZ29vZ2xlLmFwcGVuZ2luZS52MS5DcmVhdGVWZXJzaW9uTWV0YWRh", - "dGFWMUgAQhEKD21ldGhvZF9tZXRhZGF0YSIxChdDcmVhdGVWZXJzaW9uTWV0", - "YWRhdGFWMRIWCg5jbG91ZF9idWlsZF9pZBgBIAEoCULAAQoXY29tLmdvb2ds", - "ZS5hcHBlbmdpbmUudjFCDk9wZXJhdGlvblByb3RvUAFaPGdvb2dsZS5nb2xh", - "bmcub3JnL2dlbnByb3RvL2dvb2dsZWFwaXMvYXBwZW5naW5lL3YxO2FwcGVu", - "Z2luZaoCGUdvb2dsZS5DbG91ZC5BcHBFbmdpbmUuVjHKAhlHb29nbGVcQ2xv", - "dWRcQXBwRW5naW5lXFYx6gIcR29vZ2xlOjpDbG91ZDo6QXBwRW5naW5lOjpW", - "MWIGcHJvdG8z")); + "LmFwcGVuZ2luZS52MRoeZ29vZ2xlL3Byb3RvYnVmL2R1cmF0aW9uLnByb3Rv", + "Gh9nb29nbGUvcHJvdG9idWYvdGltZXN0YW1wLnByb3RvGhxnb29nbGUvYXBp", + "L2Fubm90YXRpb25zLnByb3RvIrICChNPcGVyYXRpb25NZXRhZGF0YVYxEg4K", + "Bm1ldGhvZBgBIAEoCRIvCgtpbnNlcnRfdGltZRgCIAEoCzIaLmdvb2dsZS5w", + "cm90b2J1Zi5UaW1lc3RhbXASLAoIZW5kX3RpbWUYAyABKAsyGi5nb29nbGUu", + "cHJvdG9idWYuVGltZXN0YW1wEgwKBHVzZXIYBCABKAkSDgoGdGFyZ2V0GAUg", + "ASgJEhkKEWVwaGVtZXJhbF9tZXNzYWdlGAYgASgJEg8KB3dhcm5pbmcYByAD", + "KAkSTwoXY3JlYXRlX3ZlcnNpb25fbWV0YWRhdGEYCCABKAsyLC5nb29nbGUu", + "YXBwZW5naW5lLnYxLkNyZWF0ZVZlcnNpb25NZXRhZGF0YVYxSABCEQoPbWV0", + "aG9kX21ldGFkYXRhIjEKF0NyZWF0ZVZlcnNpb25NZXRhZGF0YVYxEhYKDmNs", + "b3VkX2J1aWxkX2lkGAEgASgJQsABChdjb20uZ29vZ2xlLmFwcGVuZ2luZS52", + "MUIOT3BlcmF0aW9uUHJvdG9QAVo8Z29vZ2xlLmdvbGFuZy5vcmcvZ2VucHJv", + "dG8vZ29vZ2xlYXBpcy9hcHBlbmdpbmUvdjE7YXBwZW5naW5lqgIZR29vZ2xl", + "LkNsb3VkLkFwcEVuZ2luZS5WMcoCGUdvb2dsZVxDbG91ZFxBcHBFbmdpbmVc", + "VjHqAhxHb29nbGU6OkNsb3VkOjpBcHBFbmdpbmU6OlYxYgZwcm90bzM=")); descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData, - new pbr::FileDescriptor[] { global::Google.Protobuf.WellKnownTypes.TimestampReflection.Descriptor, global::Google.Api.AnnotationsReflection.Descriptor, }, + new pbr::FileDescriptor[] { global::Google.Protobuf.WellKnownTypes.DurationReflection.Descriptor, global::Google.Protobuf.WellKnownTypes.TimestampReflection.Descriptor, global::Google.Api.AnnotationsReflection.Descriptor, }, new pbr::GeneratedClrTypeInfo(null, null, new pbr::GeneratedClrTypeInfo[] { new pbr::GeneratedClrTypeInfo(typeof(global::Google.Cloud.AppEngine.V1.OperationMetadataV1), global::Google.Cloud.AppEngine.V1.OperationMetadataV1.Parser, new[]{ "Method", "InsertTime", "EndTime", "User", "Target", "EphemeralMessage", "Warning", "CreateVersionMetadata" }, new[]{ "MethodMetadata" }, null, null, null), new pbr::GeneratedClrTypeInfo(typeof(global::Google.Cloud.AppEngine.V1.CreateVersionMetadataV1), global::Google.Cloud.AppEngine.V1.CreateVersionMetadataV1.Parser, new[]{ "CloudBuildId" }, null, null, null, null) diff --git a/apis/Google.Cloud.AppEngine.V1/Google.Cloud.AppEngine.V1/Service.cs b/apis/Google.Cloud.AppEngine.V1/Google.Cloud.AppEngine.V1/Service.cs index 89c5c1ae901f..6c226f152047 100644 --- a/apis/Google.Cloud.AppEngine.V1/Google.Cloud.AppEngine.V1/Service.cs +++ b/apis/Google.Cloud.AppEngine.V1/Google.Cloud.AppEngine.V1/Service.cs @@ -25,24 +25,26 @@ public static partial class ServiceReflection { byte[] descriptorData = global::System.Convert.FromBase64String( string.Concat( "CiFnb29nbGUvYXBwZW5naW5lL3YxL3NlcnZpY2UucHJvdG8SE2dvb2dsZS5h", - "cHBlbmdpbmUudjEaHGdvb2dsZS9hcGkvYW5ub3RhdGlvbnMucHJvdG8iVQoH", + "cHBlbmdpbmUudjEaKmdvb2dsZS9hcHBlbmdpbmUvdjEvbmV0d29ya19zZXR0", + "aW5ncy5wcm90bxocZ29vZ2xlL2FwaS9hbm5vdGF0aW9ucy5wcm90byKVAQoH", "U2VydmljZRIMCgRuYW1lGAEgASgJEgoKAmlkGAIgASgJEjAKBXNwbGl0GAMg", - "ASgLMiEuZ29vZ2xlLmFwcGVuZ2luZS52MS5UcmFmZmljU3BsaXQihAIKDFRy", - "YWZmaWNTcGxpdBI7CghzaGFyZF9ieRgBIAEoDjIpLmdvb2dsZS5hcHBlbmdp", - "bmUudjEuVHJhZmZpY1NwbGl0LlNoYXJkQnkSRwoLYWxsb2NhdGlvbnMYAiAD", - "KAsyMi5nb29nbGUuYXBwZW5naW5lLnYxLlRyYWZmaWNTcGxpdC5BbGxvY2F0", - "aW9uc0VudHJ5GjIKEEFsbG9jYXRpb25zRW50cnkSCwoDa2V5GAEgASgJEg0K", - "BXZhbHVlGAIgASgBOgI4ASI6CgdTaGFyZEJ5Eg8KC1VOU1BFQ0lGSUVEEAAS", - "CgoGQ09PS0lFEAESBgoCSVAQAhIKCgZSQU5ET00QA0K+AQoXY29tLmdvb2ds", - "ZS5hcHBlbmdpbmUudjFCDFNlcnZpY2VQcm90b1ABWjxnb29nbGUuZ29sYW5n", - "Lm9yZy9nZW5wcm90by9nb29nbGVhcGlzL2FwcGVuZ2luZS92MTthcHBlbmdp", - "bmWqAhlHb29nbGUuQ2xvdWQuQXBwRW5naW5lLlYxygIZR29vZ2xlXENsb3Vk", - "XEFwcEVuZ2luZVxWMeoCHEdvb2dsZTo6Q2xvdWQ6OkFwcEVuZ2luZTo6VjFi", - "BnByb3RvMw==")); + "ASgLMiEuZ29vZ2xlLmFwcGVuZ2luZS52MS5UcmFmZmljU3BsaXQSPgoQbmV0", + "d29ya19zZXR0aW5ncxgGIAEoCzIkLmdvb2dsZS5hcHBlbmdpbmUudjEuTmV0", + "d29ya1NldHRpbmdzIoQCCgxUcmFmZmljU3BsaXQSOwoIc2hhcmRfYnkYASAB", + "KA4yKS5nb29nbGUuYXBwZW5naW5lLnYxLlRyYWZmaWNTcGxpdC5TaGFyZEJ5", + "EkcKC2FsbG9jYXRpb25zGAIgAygLMjIuZ29vZ2xlLmFwcGVuZ2luZS52MS5U", + "cmFmZmljU3BsaXQuQWxsb2NhdGlvbnNFbnRyeRoyChBBbGxvY2F0aW9uc0Vu", + "dHJ5EgsKA2tleRgBIAEoCRINCgV2YWx1ZRgCIAEoAToCOAEiOgoHU2hhcmRC", + "eRIPCgtVTlNQRUNJRklFRBAAEgoKBkNPT0tJRRABEgYKAklQEAISCgoGUkFO", + "RE9NEANCvgEKF2NvbS5nb29nbGUuYXBwZW5naW5lLnYxQgxTZXJ2aWNlUHJv", + "dG9QAVo8Z29vZ2xlLmdvbGFuZy5vcmcvZ2VucHJvdG8vZ29vZ2xlYXBpcy9h", + "cHBlbmdpbmUvdjE7YXBwZW5naW5lqgIZR29vZ2xlLkNsb3VkLkFwcEVuZ2lu", + "ZS5WMcoCGUdvb2dsZVxDbG91ZFxBcHBFbmdpbmVcVjHqAhxHb29nbGU6OkNs", + "b3VkOjpBcHBFbmdpbmU6OlYxYgZwcm90bzM=")); descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData, - new pbr::FileDescriptor[] { global::Google.Api.AnnotationsReflection.Descriptor, }, + new pbr::FileDescriptor[] { global::Google.Cloud.AppEngine.V1.NetworkSettingsReflection.Descriptor, global::Google.Api.AnnotationsReflection.Descriptor, }, new pbr::GeneratedClrTypeInfo(null, null, new pbr::GeneratedClrTypeInfo[] { - new pbr::GeneratedClrTypeInfo(typeof(global::Google.Cloud.AppEngine.V1.Service), global::Google.Cloud.AppEngine.V1.Service.Parser, new[]{ "Name", "Id", "Split" }, null, null, null, null), + new pbr::GeneratedClrTypeInfo(typeof(global::Google.Cloud.AppEngine.V1.Service), global::Google.Cloud.AppEngine.V1.Service.Parser, new[]{ "Name", "Id", "Split", "NetworkSettings" }, null, null, null, null), new pbr::GeneratedClrTypeInfo(typeof(global::Google.Cloud.AppEngine.V1.TrafficSplit), global::Google.Cloud.AppEngine.V1.TrafficSplit.Parser, new[]{ "ShardBy", "Allocations" }, null, new[]{ typeof(global::Google.Cloud.AppEngine.V1.TrafficSplit.Types.ShardBy) }, null, new pbr::GeneratedClrTypeInfo[] { null, }) })); } @@ -91,6 +93,7 @@ public sealed partial class Service : pb::IMessage name_ = other.name_; id_ = other.id_; split_ = other.split_ != null ? other.split_.Clone() : null; + networkSettings_ = other.networkSettings_ != null ? other.networkSettings_.Clone() : null; _unknownFields = pb::UnknownFieldSet.Clone(other._unknownFields); } @@ -148,6 +151,20 @@ public sealed partial class Service : pb::IMessage } } + /// Field number for the "network_settings" field. + public const int NetworkSettingsFieldNumber = 6; + private global::Google.Cloud.AppEngine.V1.NetworkSettings networkSettings_; + /// + /// Ingress settings for this service. Will apply to all versions. + /// + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public global::Google.Cloud.AppEngine.V1.NetworkSettings NetworkSettings { + get { return networkSettings_; } + set { + networkSettings_ = value; + } + } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] public override bool Equals(object other) { return Equals(other as Service); @@ -164,6 +181,7 @@ public sealed partial class Service : pb::IMessage if (Name != other.Name) return false; if (Id != other.Id) return false; if (!object.Equals(Split, other.Split)) return false; + if (!object.Equals(NetworkSettings, other.NetworkSettings)) return false; return Equals(_unknownFields, other._unknownFields); } @@ -173,6 +191,7 @@ public sealed partial class Service : pb::IMessage if (Name.Length != 0) hash ^= Name.GetHashCode(); if (Id.Length != 0) hash ^= Id.GetHashCode(); if (split_ != null) hash ^= Split.GetHashCode(); + if (networkSettings_ != null) hash ^= NetworkSettings.GetHashCode(); if (_unknownFields != null) { hash ^= _unknownFields.GetHashCode(); } @@ -201,6 +220,10 @@ public sealed partial class Service : pb::IMessage output.WriteRawTag(26); output.WriteMessage(Split); } + if (networkSettings_ != null) { + output.WriteRawTag(50); + output.WriteMessage(NetworkSettings); + } if (_unknownFields != null) { _unknownFields.WriteTo(output); } @@ -222,6 +245,10 @@ public sealed partial class Service : pb::IMessage output.WriteRawTag(26); output.WriteMessage(Split); } + if (networkSettings_ != null) { + output.WriteRawTag(50); + output.WriteMessage(NetworkSettings); + } if (_unknownFields != null) { _unknownFields.WriteTo(ref output); } @@ -240,6 +267,9 @@ public sealed partial class Service : pb::IMessage if (split_ != null) { size += 1 + pb::CodedOutputStream.ComputeMessageSize(Split); } + if (networkSettings_ != null) { + size += 1 + pb::CodedOutputStream.ComputeMessageSize(NetworkSettings); + } if (_unknownFields != null) { size += _unknownFields.CalculateSize(); } @@ -263,6 +293,12 @@ public sealed partial class Service : pb::IMessage } Split.MergeFrom(other.Split); } + if (other.networkSettings_ != null) { + if (networkSettings_ == null) { + NetworkSettings = new global::Google.Cloud.AppEngine.V1.NetworkSettings(); + } + NetworkSettings.MergeFrom(other.NetworkSettings); + } _unknownFields = pb::UnknownFieldSet.MergeFrom(_unknownFields, other._unknownFields); } @@ -292,6 +328,13 @@ public sealed partial class Service : pb::IMessage input.ReadMessage(Split); break; } + case 50: { + if (networkSettings_ == null) { + NetworkSettings = new global::Google.Cloud.AppEngine.V1.NetworkSettings(); + } + input.ReadMessage(NetworkSettings); + break; + } } } #endif @@ -321,6 +364,13 @@ public sealed partial class Service : pb::IMessage input.ReadMessage(Split); break; } + case 50: { + if (networkSettings_ == null) { + NetworkSettings = new global::Google.Cloud.AppEngine.V1.NetworkSettings(); + } + input.ReadMessage(NetworkSettings); + break; + } } } } diff --git a/apis/Google.Cloud.AppEngine.V1/Google.Cloud.AppEngine.V1/ServicesClient.g.cs b/apis/Google.Cloud.AppEngine.V1/Google.Cloud.AppEngine.V1/ServicesClient.g.cs index 741cd7f9bd56..bdde8fca6507 100644 --- a/apis/Google.Cloud.AppEngine.V1/Google.Cloud.AppEngine.V1/ServicesClient.g.cs +++ b/apis/Google.Cloud.AppEngine.V1/Google.Cloud.AppEngine.V1/ServicesClient.g.cs @@ -64,10 +64,10 @@ private ServicesSettings(ServicesSettings existing) : base(existing) /// /// /// This call will not be retried. - /// No timeout is applied. + /// Timeout: 60 seconds. /// /// - public gaxgrpc::CallSettings ListServicesSettings { get; set; } = gaxgrpc::CallSettings.FromExpiration(gax::Expiration.None); + public gaxgrpc::CallSettings ListServicesSettings { get; set; } = gaxgrpc::CallSettings.FromExpiration(gax::Expiration.FromTimeout(sys::TimeSpan.FromMilliseconds(60000))); /// /// for synchronous and asynchronous calls to ServicesClient.GetService @@ -76,10 +76,10 @@ private ServicesSettings(ServicesSettings existing) : base(existing) /// /// /// This call will not be retried. - /// No timeout is applied. + /// Timeout: 60 seconds. /// /// - public gaxgrpc::CallSettings GetServiceSettings { get; set; } = gaxgrpc::CallSettings.FromExpiration(gax::Expiration.None); + public gaxgrpc::CallSettings GetServiceSettings { get; set; } = gaxgrpc::CallSettings.FromExpiration(gax::Expiration.FromTimeout(sys::TimeSpan.FromMilliseconds(60000))); /// /// for synchronous and asynchronous calls to @@ -88,10 +88,10 @@ private ServicesSettings(ServicesSettings existing) : base(existing) /// /// /// This call will not be retried. - /// No timeout is applied. + /// Timeout: 60 seconds. /// /// - public gaxgrpc::CallSettings UpdateServiceSettings { get; set; } = gaxgrpc::CallSettings.FromExpiration(gax::Expiration.None); + public gaxgrpc::CallSettings UpdateServiceSettings { get; set; } = gaxgrpc::CallSettings.FromExpiration(gax::Expiration.FromTimeout(sys::TimeSpan.FromMilliseconds(60000))); /// /// Long Running Operation settings for calls to ServicesClient.UpdateService and @@ -118,10 +118,10 @@ private ServicesSettings(ServicesSettings existing) : base(existing) /// /// /// This call will not be retried. - /// No timeout is applied. + /// Timeout: 60 seconds. /// /// - public gaxgrpc::CallSettings DeleteServiceSettings { get; set; } = gaxgrpc::CallSettings.FromExpiration(gax::Expiration.None); + public gaxgrpc::CallSettings DeleteServiceSettings { get; set; } = gaxgrpc::CallSettings.FromExpiration(gax::Expiration.FromTimeout(sys::TimeSpan.FromMilliseconds(60000))); /// /// Long Running Operation settings for calls to ServicesClient.DeleteService and diff --git a/apis/Google.Cloud.AppEngine.V1/Google.Cloud.AppEngine.V1/Version.cs b/apis/Google.Cloud.AppEngine.V1/Google.Cloud.AppEngine.V1/Version.cs index 7c34a43f86b0..7aedc9e22606 100644 --- a/apis/Google.Cloud.AppEngine.V1/Google.Cloud.AppEngine.V1/Version.cs +++ b/apis/Google.Cloud.AppEngine.V1/Google.Cloud.AppEngine.V1/Version.cs @@ -26,113 +26,118 @@ public static partial class VersionReflection { string.Concat( "CiFnb29nbGUvYXBwZW5naW5lL3YxL3ZlcnNpb24ucHJvdG8SE2dvb2dsZS5h", "cHBlbmdpbmUudjEaImdvb2dsZS9hcHBlbmdpbmUvdjEvYXBwX3lhbWwucHJv", - "dG8aIGdvb2dsZS9hcHBlbmdpbmUvdjEvZGVwbG95LnByb3RvGh5nb29nbGUv", - "cHJvdG9idWYvZHVyYXRpb24ucHJvdG8aH2dvb2dsZS9wcm90b2J1Zi90aW1l", - "c3RhbXAucHJvdG8aHGdvb2dsZS9hcGkvYW5ub3RhdGlvbnMucHJvdG8i0A0K", - "B1ZlcnNpb24SDAoEbmFtZRgBIAEoCRIKCgJpZBgCIAEoCRJCChFhdXRvbWF0", - "aWNfc2NhbGluZxgDIAEoCzIlLmdvb2dsZS5hcHBlbmdpbmUudjEuQXV0b21h", - "dGljU2NhbGluZ0gAEjoKDWJhc2ljX3NjYWxpbmcYBCABKAsyIS5nb29nbGUu", - "YXBwZW5naW5lLnYxLkJhc2ljU2NhbGluZ0gAEjwKDm1hbnVhbF9zY2FsaW5n", - "GAUgASgLMiIuZ29vZ2xlLmFwcGVuZ2luZS52MS5NYW51YWxTY2FsaW5nSAAS", - "QQoQaW5ib3VuZF9zZXJ2aWNlcxgGIAMoDjInLmdvb2dsZS5hcHBlbmdpbmUu", - "djEuSW5ib3VuZFNlcnZpY2VUeXBlEhYKDmluc3RhbmNlX2NsYXNzGAcgASgJ", - "Ei0KB25ldHdvcmsYCCABKAsyHC5nb29nbGUuYXBwZW5naW5lLnYxLk5ldHdv", - "cmsSDQoFem9uZXMYdiADKAkSMQoJcmVzb3VyY2VzGAkgASgLMh4uZ29vZ2xl", - "LmFwcGVuZ2luZS52MS5SZXNvdXJjZXMSDwoHcnVudGltZRgKIAEoCRIXCg9y", - "dW50aW1lX2NoYW5uZWwYdSABKAkSEgoKdGhyZWFkc2FmZRgLIAEoCBIKCgJ2", - "bRgMIAEoCBJFCg1iZXRhX3NldHRpbmdzGA0gAygLMi4uZ29vZ2xlLmFwcGVu", - "Z2luZS52MS5WZXJzaW9uLkJldGFTZXR0aW5nc0VudHJ5EgsKA2VudhgOIAEo", - "CRI6Cg5zZXJ2aW5nX3N0YXR1cxgPIAEoDjIiLmdvb2dsZS5hcHBlbmdpbmUu", - "djEuU2VydmluZ1N0YXR1cxISCgpjcmVhdGVkX2J5GBAgASgJEi8KC2NyZWF0", - "ZV90aW1lGBEgASgLMhouZ29vZ2xlLnByb3RvYnVmLlRpbWVzdGFtcBIYChBk", - "aXNrX3VzYWdlX2J5dGVzGBIgASgDEhsKE3J1bnRpbWVfYXBpX3ZlcnNpb24Y", - "FSABKAkSJAoccnVudGltZV9tYWluX2V4ZWN1dGFibGVfcGF0aBgWIAEoCRIt", - "CghoYW5kbGVycxhkIAMoCzIbLmdvb2dsZS5hcHBlbmdpbmUudjEuVXJsTWFw", - "EjkKDmVycm9yX2hhbmRsZXJzGGUgAygLMiEuZ29vZ2xlLmFwcGVuZ2luZS52", - "MS5FcnJvckhhbmRsZXISLwoJbGlicmFyaWVzGGYgAygLMhwuZ29vZ2xlLmFw", - "cGVuZ2luZS52MS5MaWJyYXJ5EjkKCmFwaV9jb25maWcYZyABKAsyJS5nb29n", - "bGUuYXBwZW5naW5lLnYxLkFwaUNvbmZpZ0hhbmRsZXISRQoNZW52X3Zhcmlh", - "YmxlcxhoIAMoCzIuLmdvb2dsZS5hcHBlbmdpbmUudjEuVmVyc2lvbi5FbnZW", - "YXJpYWJsZXNFbnRyeRI1ChJkZWZhdWx0X2V4cGlyYXRpb24YaSABKAsyGS5n", - "b29nbGUucHJvdG9idWYuRHVyYXRpb24SNgoMaGVhbHRoX2NoZWNrGGogASgL", - "MiAuZ29vZ2xlLmFwcGVuZ2luZS52MS5IZWFsdGhDaGVjaxI8Cg9yZWFkaW5l", - "c3NfY2hlY2sYcCABKAsyIy5nb29nbGUuYXBwZW5naW5lLnYxLlJlYWRpbmVz", - "c0NoZWNrEjoKDmxpdmVuZXNzX2NoZWNrGHEgASgLMiIuZ29vZ2xlLmFwcGVu", - "Z2luZS52MS5MaXZlbmVzc0NoZWNrEhsKE25vYnVpbGRfZmlsZXNfcmVnZXgY", - "ayABKAkSMwoKZGVwbG95bWVudBhsIAEoCzIfLmdvb2dsZS5hcHBlbmdpbmUu", - "djEuRGVwbG95bWVudBITCgt2ZXJzaW9uX3VybBhtIAEoCRJHChVlbmRwb2lu", - "dHNfYXBpX3NlcnZpY2UYbiABKAsyKC5nb29nbGUuYXBwZW5naW5lLnYxLkVu", - "ZHBvaW50c0FwaVNlcnZpY2USMwoKZW50cnlwb2ludBh6IAEoCzIfLmdvb2ds", - "ZS5hcHBlbmdpbmUudjEuRW50cnlwb2ludBJFChR2cGNfYWNjZXNzX2Nvbm5l", - "Y3Rvchh5IAEoCzInLmdvb2dsZS5hcHBlbmdpbmUudjEuVnBjQWNjZXNzQ29u", - "bmVjdG9yGjMKEUJldGFTZXR0aW5nc0VudHJ5EgsKA2tleRgBIAEoCRINCgV2", - "YWx1ZRgCIAEoCToCOAEaMwoRRW52VmFyaWFibGVzRW50cnkSCwoDa2V5GAEg", - "ASgJEg0KBXZhbHVlGAIgASgJOgI4AUIJCgdzY2FsaW5nIvcBChNFbmRwb2lu", - "dHNBcGlTZXJ2aWNlEgwKBG5hbWUYASABKAkSEQoJY29uZmlnX2lkGAIgASgJ", - "ElIKEHJvbGxvdXRfc3RyYXRlZ3kYAyABKA4yOC5nb29nbGUuYXBwZW5naW5l", - "LnYxLkVuZHBvaW50c0FwaVNlcnZpY2UuUm9sbG91dFN0cmF0ZWd5Eh4KFmRp", - "c2FibGVfdHJhY2Vfc2FtcGxpbmcYBCABKAgiSwoPUm9sbG91dFN0cmF0ZWd5", - "EiAKHFVOU1BFQ0lGSUVEX1JPTExPVVRfU1RSQVRFR1kQABIJCgVGSVhFRBAB", - "EgsKB01BTkFHRUQQAiKpBQoQQXV0b21hdGljU2NhbGluZxIzChBjb29sX2Rv", - "d25fcGVyaW9kGAEgASgLMhkuZ29vZ2xlLnByb3RvYnVmLkR1cmF0aW9uEjwK", - "D2NwdV91dGlsaXphdGlvbhgCIAEoCzIjLmdvb2dsZS5hcHBlbmdpbmUudjEu", - "Q3B1VXRpbGl6YXRpb24SHwoXbWF4X2NvbmN1cnJlbnRfcmVxdWVzdHMYAyAB", - "KAUSGgoSbWF4X2lkbGVfaW5zdGFuY2VzGAQgASgFEhsKE21heF90b3RhbF9p", - "bnN0YW5jZXMYBSABKAUSNgoTbWF4X3BlbmRpbmdfbGF0ZW5jeRgGIAEoCzIZ", - "Lmdvb2dsZS5wcm90b2J1Zi5EdXJhdGlvbhIaChJtaW5faWRsZV9pbnN0YW5j", - "ZXMYByABKAUSGwoTbWluX3RvdGFsX2luc3RhbmNlcxgIIAEoBRI2ChNtaW5f", - "cGVuZGluZ19sYXRlbmN5GAkgASgLMhkuZ29vZ2xlLnByb3RvYnVmLkR1cmF0", - "aW9uEkQKE3JlcXVlc3RfdXRpbGl6YXRpb24YCiABKAsyJy5nb29nbGUuYXBw", - "ZW5naW5lLnYxLlJlcXVlc3RVdGlsaXphdGlvbhI+ChBkaXNrX3V0aWxpemF0", - "aW9uGAsgASgLMiQuZ29vZ2xlLmFwcGVuZ2luZS52MS5EaXNrVXRpbGl6YXRp", - "b24SRAoTbmV0d29ya191dGlsaXphdGlvbhgMIAEoCzInLmdvb2dsZS5hcHBl", - "bmdpbmUudjEuTmV0d29ya1V0aWxpemF0aW9uElMKG3N0YW5kYXJkX3NjaGVk", - "dWxlcl9zZXR0aW5ncxgUIAEoCzIuLmdvb2dsZS5hcHBlbmdpbmUudjEuU3Rh", - "bmRhcmRTY2hlZHVsZXJTZXR0aW5ncyJWCgxCYXNpY1NjYWxpbmcSLwoMaWRs", - "ZV90aW1lb3V0GAEgASgLMhkuZ29vZ2xlLnByb3RvYnVmLkR1cmF0aW9uEhUK", - "DW1heF9pbnN0YW5jZXMYAiABKAUiIgoNTWFudWFsU2NhbGluZxIRCglpbnN0", - "YW5jZXMYASABKAUiagoOQ3B1VXRpbGl6YXRpb24SPAoZYWdncmVnYXRpb25f", - "d2luZG93X2xlbmd0aBgBIAEoCzIZLmdvb2dsZS5wcm90b2J1Zi5EdXJhdGlv", - "bhIaChJ0YXJnZXRfdXRpbGl6YXRpb24YAiABKAEiYQoSUmVxdWVzdFV0aWxp", - "emF0aW9uEicKH3RhcmdldF9yZXF1ZXN0X2NvdW50X3Blcl9zZWNvbmQYASAB", - "KAUSIgoadGFyZ2V0X2NvbmN1cnJlbnRfcmVxdWVzdHMYAiABKAUipwEKD0Rp", - "c2tVdGlsaXphdGlvbhIlCh10YXJnZXRfd3JpdGVfYnl0ZXNfcGVyX3NlY29u", - "ZBgOIAEoBRIjCht0YXJnZXRfd3JpdGVfb3BzX3Blcl9zZWNvbmQYDyABKAUS", - "JAocdGFyZ2V0X3JlYWRfYnl0ZXNfcGVyX3NlY29uZBgQIAEoBRIiChp0YXJn", - "ZXRfcmVhZF9vcHNfcGVyX3NlY29uZBgRIAEoBSK4AQoSTmV0d29ya1V0aWxp", - "emF0aW9uEiQKHHRhcmdldF9zZW50X2J5dGVzX3Blcl9zZWNvbmQYASABKAUS", - "JgoedGFyZ2V0X3NlbnRfcGFja2V0c19wZXJfc2Vjb25kGAsgASgFEigKIHRh", - "cmdldF9yZWNlaXZlZF9ieXRlc19wZXJfc2Vjb25kGAwgASgFEioKInRhcmdl", - "dF9yZWNlaXZlZF9wYWNrZXRzX3Blcl9zZWNvbmQYDSABKAUikAEKGVN0YW5k", - "YXJkU2NoZWR1bGVyU2V0dGluZ3MSHgoWdGFyZ2V0X2NwdV91dGlsaXphdGlv", - "bhgBIAEoARIlCh10YXJnZXRfdGhyb3VnaHB1dF91dGlsaXphdGlvbhgCIAEo", - "ARIVCg1taW5faW5zdGFuY2VzGAMgASgFEhUKDW1heF9pbnN0YW5jZXMYBCAB", - "KAUieQoHTmV0d29yaxIXCg9mb3J3YXJkZWRfcG9ydHMYASADKAkSFAoMaW5z", - "dGFuY2VfdGFnGAIgASgJEgwKBG5hbWUYAyABKAkSFwoPc3VibmV0d29ya19u", - "YW1lGAQgASgJEhgKEHNlc3Npb25fYWZmaW5pdHkYBSABKAgiPAoGVm9sdW1l", - "EgwKBG5hbWUYASABKAkSEwoLdm9sdW1lX3R5cGUYAiABKAkSDwoHc2l6ZV9n", - "YhgDIAEoASJqCglSZXNvdXJjZXMSCwoDY3B1GAEgASgBEg8KB2Rpc2tfZ2IY", - "AiABKAESEQoJbWVtb3J5X2diGAMgASgBEiwKB3ZvbHVtZXMYBCADKAsyGy5n", - "b29nbGUuYXBwZW5naW5lLnYxLlZvbHVtZSIiChJWcGNBY2Nlc3NDb25uZWN0", - "b3ISDAoEbmFtZRgBIAEoCSIoCgpFbnRyeXBvaW50Eg8KBXNoZWxsGAEgASgJ", - "SABCCQoHY29tbWFuZCq7AgoSSW5ib3VuZFNlcnZpY2VUeXBlEh8KG0lOQk9V", - "TkRfU0VSVklDRV9VTlNQRUNJRklFRBAAEhgKFElOQk9VTkRfU0VSVklDRV9N", - "QUlMEAESHwobSU5CT1VORF9TRVJWSUNFX01BSUxfQk9VTkNFEAISHgoaSU5C", - "T1VORF9TRVJWSUNFX1hNUFBfRVJST1IQAxIgChxJTkJPVU5EX1NFUlZJQ0Vf", - "WE1QUF9NRVNTQUdFEAQSIgoeSU5CT1VORF9TRVJWSUNFX1hNUFBfU1VCU0NS", - "SUJFEAUSIQodSU5CT1VORF9TRVJWSUNFX1hNUFBfUFJFU0VOQ0UQBhIkCiBJ", - "TkJPVU5EX1NFUlZJQ0VfQ0hBTk5FTF9QUkVTRU5DRRAHEhoKFklOQk9VTkRf", - "U0VSVklDRV9XQVJNVVAQCSpJCg1TZXJ2aW5nU3RhdHVzEh4KGlNFUlZJTkdf", - "U1RBVFVTX1VOU1BFQ0lGSUVEEAASCwoHU0VSVklORxABEgsKB1NUT1BQRUQQ", - "AkK+AQoXY29tLmdvb2dsZS5hcHBlbmdpbmUudjFCDFZlcnNpb25Qcm90b1AB", - "Wjxnb29nbGUuZ29sYW5nLm9yZy9nZW5wcm90by9nb29nbGVhcGlzL2FwcGVu", - "Z2luZS92MTthcHBlbmdpbmWqAhlHb29nbGUuQ2xvdWQuQXBwRW5naW5lLlYx", - "ygIZR29vZ2xlXENsb3VkXEFwcEVuZ2luZVxWMeoCHEdvb2dsZTo6Q2xvdWQ6", - "OkFwcEVuZ2luZTo6VjFiBnByb3RvMw==")); + "dG8aIGdvb2dsZS9hcHBlbmdpbmUvdjEvZGVwbG95LnByb3RvGipnb29nbGUv", + "YXBwZW5naW5lL3YxL25ldHdvcmtfc2V0dGluZ3MucHJvdG8aHmdvb2dsZS9w", + "cm90b2J1Zi9kdXJhdGlvbi5wcm90bxofZ29vZ2xlL3Byb3RvYnVmL3RpbWVz", + "dGFtcC5wcm90bxocZ29vZ2xlL2FwaS9hbm5vdGF0aW9ucy5wcm90byL1DgoH", + "VmVyc2lvbhIMCgRuYW1lGAEgASgJEgoKAmlkGAIgASgJEkIKEWF1dG9tYXRp", + "Y19zY2FsaW5nGAMgASgLMiUuZ29vZ2xlLmFwcGVuZ2luZS52MS5BdXRvbWF0", + "aWNTY2FsaW5nSAASOgoNYmFzaWNfc2NhbGluZxgEIAEoCzIhLmdvb2dsZS5h", + "cHBlbmdpbmUudjEuQmFzaWNTY2FsaW5nSAASPAoObWFudWFsX3NjYWxpbmcY", + "BSABKAsyIi5nb29nbGUuYXBwZW5naW5lLnYxLk1hbnVhbFNjYWxpbmdIABJB", + "ChBpbmJvdW5kX3NlcnZpY2VzGAYgAygOMicuZ29vZ2xlLmFwcGVuZ2luZS52", + "MS5JbmJvdW5kU2VydmljZVR5cGUSFgoOaW5zdGFuY2VfY2xhc3MYByABKAkS", + "LQoHbmV0d29yaxgIIAEoCzIcLmdvb2dsZS5hcHBlbmdpbmUudjEuTmV0d29y", + "axINCgV6b25lcxh2IAMoCRIxCglyZXNvdXJjZXMYCSABKAsyHi5nb29nbGUu", + "YXBwZW5naW5lLnYxLlJlc291cmNlcxIPCgdydW50aW1lGAogASgJEhcKD3J1", + "bnRpbWVfY2hhbm5lbBh1IAEoCRISCgp0aHJlYWRzYWZlGAsgASgIEgoKAnZt", + "GAwgASgIEkUKDWJldGFfc2V0dGluZ3MYDSADKAsyLi5nb29nbGUuYXBwZW5n", + "aW5lLnYxLlZlcnNpb24uQmV0YVNldHRpbmdzRW50cnkSCwoDZW52GA4gASgJ", + "EjoKDnNlcnZpbmdfc3RhdHVzGA8gASgOMiIuZ29vZ2xlLmFwcGVuZ2luZS52", + "MS5TZXJ2aW5nU3RhdHVzEhIKCmNyZWF0ZWRfYnkYECABKAkSLwoLY3JlYXRl", + "X3RpbWUYESABKAsyGi5nb29nbGUucHJvdG9idWYuVGltZXN0YW1wEhgKEGRp", + "c2tfdXNhZ2VfYnl0ZXMYEiABKAMSGwoTcnVudGltZV9hcGlfdmVyc2lvbhgV", + "IAEoCRIkChxydW50aW1lX21haW5fZXhlY3V0YWJsZV9wYXRoGBYgASgJEhcK", + "D3NlcnZpY2VfYWNjb3VudBh/IAEoCRItCghoYW5kbGVycxhkIAMoCzIbLmdv", + "b2dsZS5hcHBlbmdpbmUudjEuVXJsTWFwEjkKDmVycm9yX2hhbmRsZXJzGGUg", + "AygLMiEuZ29vZ2xlLmFwcGVuZ2luZS52MS5FcnJvckhhbmRsZXISLwoJbGli", + "cmFyaWVzGGYgAygLMhwuZ29vZ2xlLmFwcGVuZ2luZS52MS5MaWJyYXJ5EjkK", + "CmFwaV9jb25maWcYZyABKAsyJS5nb29nbGUuYXBwZW5naW5lLnYxLkFwaUNv", + "bmZpZ0hhbmRsZXISRQoNZW52X3ZhcmlhYmxlcxhoIAMoCzIuLmdvb2dsZS5h", + "cHBlbmdpbmUudjEuVmVyc2lvbi5FbnZWYXJpYWJsZXNFbnRyeRJQChNidWls", + "ZF9lbnZfdmFyaWFibGVzGH0gAygLMjMuZ29vZ2xlLmFwcGVuZ2luZS52MS5W", + "ZXJzaW9uLkJ1aWxkRW52VmFyaWFibGVzRW50cnkSNQoSZGVmYXVsdF9leHBp", + "cmF0aW9uGGkgASgLMhkuZ29vZ2xlLnByb3RvYnVmLkR1cmF0aW9uEjYKDGhl", + "YWx0aF9jaGVjaxhqIAEoCzIgLmdvb2dsZS5hcHBlbmdpbmUudjEuSGVhbHRo", + "Q2hlY2sSPAoPcmVhZGluZXNzX2NoZWNrGHAgASgLMiMuZ29vZ2xlLmFwcGVu", + "Z2luZS52MS5SZWFkaW5lc3NDaGVjaxI6Cg5saXZlbmVzc19jaGVjaxhxIAEo", + "CzIiLmdvb2dsZS5hcHBlbmdpbmUudjEuTGl2ZW5lc3NDaGVjaxIbChNub2J1", + "aWxkX2ZpbGVzX3JlZ2V4GGsgASgJEjMKCmRlcGxveW1lbnQYbCABKAsyHy5n", + "b29nbGUuYXBwZW5naW5lLnYxLkRlcGxveW1lbnQSEwoLdmVyc2lvbl91cmwY", + "bSABKAkSRwoVZW5kcG9pbnRzX2FwaV9zZXJ2aWNlGG4gASgLMiguZ29vZ2xl", + "LmFwcGVuZ2luZS52MS5FbmRwb2ludHNBcGlTZXJ2aWNlEjMKCmVudHJ5cG9p", + "bnQYeiABKAsyHy5nb29nbGUuYXBwZW5naW5lLnYxLkVudHJ5cG9pbnQSRQoU", + "dnBjX2FjY2Vzc19jb25uZWN0b3IYeSABKAsyJy5nb29nbGUuYXBwZW5naW5l", + "LnYxLlZwY0FjY2Vzc0Nvbm5lY3RvchozChFCZXRhU2V0dGluZ3NFbnRyeRIL", + "CgNrZXkYASABKAkSDQoFdmFsdWUYAiABKAk6AjgBGjMKEUVudlZhcmlhYmxl", + "c0VudHJ5EgsKA2tleRgBIAEoCRINCgV2YWx1ZRgCIAEoCToCOAEaOAoWQnVp", + "bGRFbnZWYXJpYWJsZXNFbnRyeRILCgNrZXkYASABKAkSDQoFdmFsdWUYAiAB", + "KAk6AjgBQgkKB3NjYWxpbmci9wEKE0VuZHBvaW50c0FwaVNlcnZpY2USDAoE", + "bmFtZRgBIAEoCRIRCgljb25maWdfaWQYAiABKAkSUgoQcm9sbG91dF9zdHJh", + "dGVneRgDIAEoDjI4Lmdvb2dsZS5hcHBlbmdpbmUudjEuRW5kcG9pbnRzQXBp", + "U2VydmljZS5Sb2xsb3V0U3RyYXRlZ3kSHgoWZGlzYWJsZV90cmFjZV9zYW1w", + "bGluZxgEIAEoCCJLCg9Sb2xsb3V0U3RyYXRlZ3kSIAocVU5TUEVDSUZJRURf", + "Uk9MTE9VVF9TVFJBVEVHWRAAEgkKBUZJWEVEEAESCwoHTUFOQUdFRBACIqkF", + "ChBBdXRvbWF0aWNTY2FsaW5nEjMKEGNvb2xfZG93bl9wZXJpb2QYASABKAsy", + "GS5nb29nbGUucHJvdG9idWYuRHVyYXRpb24SPAoPY3B1X3V0aWxpemF0aW9u", + "GAIgASgLMiMuZ29vZ2xlLmFwcGVuZ2luZS52MS5DcHVVdGlsaXphdGlvbhIf", + "ChdtYXhfY29uY3VycmVudF9yZXF1ZXN0cxgDIAEoBRIaChJtYXhfaWRsZV9p", + "bnN0YW5jZXMYBCABKAUSGwoTbWF4X3RvdGFsX2luc3RhbmNlcxgFIAEoBRI2", + "ChNtYXhfcGVuZGluZ19sYXRlbmN5GAYgASgLMhkuZ29vZ2xlLnByb3RvYnVm", + "LkR1cmF0aW9uEhoKEm1pbl9pZGxlX2luc3RhbmNlcxgHIAEoBRIbChNtaW5f", + "dG90YWxfaW5zdGFuY2VzGAggASgFEjYKE21pbl9wZW5kaW5nX2xhdGVuY3kY", + "CSABKAsyGS5nb29nbGUucHJvdG9idWYuRHVyYXRpb24SRAoTcmVxdWVzdF91", + "dGlsaXphdGlvbhgKIAEoCzInLmdvb2dsZS5hcHBlbmdpbmUudjEuUmVxdWVz", + "dFV0aWxpemF0aW9uEj4KEGRpc2tfdXRpbGl6YXRpb24YCyABKAsyJC5nb29n", + "bGUuYXBwZW5naW5lLnYxLkRpc2tVdGlsaXphdGlvbhJEChNuZXR3b3JrX3V0", + "aWxpemF0aW9uGAwgASgLMicuZ29vZ2xlLmFwcGVuZ2luZS52MS5OZXR3b3Jr", + "VXRpbGl6YXRpb24SUwobc3RhbmRhcmRfc2NoZWR1bGVyX3NldHRpbmdzGBQg", + "ASgLMi4uZ29vZ2xlLmFwcGVuZ2luZS52MS5TdGFuZGFyZFNjaGVkdWxlclNl", + "dHRpbmdzIlYKDEJhc2ljU2NhbGluZxIvCgxpZGxlX3RpbWVvdXQYASABKAsy", + "GS5nb29nbGUucHJvdG9idWYuRHVyYXRpb24SFQoNbWF4X2luc3RhbmNlcxgC", + "IAEoBSIiCg1NYW51YWxTY2FsaW5nEhEKCWluc3RhbmNlcxgBIAEoBSJqCg5D", + "cHVVdGlsaXphdGlvbhI8ChlhZ2dyZWdhdGlvbl93aW5kb3dfbGVuZ3RoGAEg", + "ASgLMhkuZ29vZ2xlLnByb3RvYnVmLkR1cmF0aW9uEhoKEnRhcmdldF91dGls", + "aXphdGlvbhgCIAEoASJhChJSZXF1ZXN0VXRpbGl6YXRpb24SJwofdGFyZ2V0", + "X3JlcXVlc3RfY291bnRfcGVyX3NlY29uZBgBIAEoBRIiChp0YXJnZXRfY29u", + "Y3VycmVudF9yZXF1ZXN0cxgCIAEoBSKnAQoPRGlza1V0aWxpemF0aW9uEiUK", + "HXRhcmdldF93cml0ZV9ieXRlc19wZXJfc2Vjb25kGA4gASgFEiMKG3Rhcmdl", + "dF93cml0ZV9vcHNfcGVyX3NlY29uZBgPIAEoBRIkChx0YXJnZXRfcmVhZF9i", + "eXRlc19wZXJfc2Vjb25kGBAgASgFEiIKGnRhcmdldF9yZWFkX29wc19wZXJf", + "c2Vjb25kGBEgASgFIrgBChJOZXR3b3JrVXRpbGl6YXRpb24SJAocdGFyZ2V0", + "X3NlbnRfYnl0ZXNfcGVyX3NlY29uZBgBIAEoBRImCh50YXJnZXRfc2VudF9w", + "YWNrZXRzX3Blcl9zZWNvbmQYCyABKAUSKAogdGFyZ2V0X3JlY2VpdmVkX2J5", + "dGVzX3Blcl9zZWNvbmQYDCABKAUSKgoidGFyZ2V0X3JlY2VpdmVkX3BhY2tl", + "dHNfcGVyX3NlY29uZBgNIAEoBSKQAQoZU3RhbmRhcmRTY2hlZHVsZXJTZXR0", + "aW5ncxIeChZ0YXJnZXRfY3B1X3V0aWxpemF0aW9uGAEgASgBEiUKHXRhcmdl", + "dF90aHJvdWdocHV0X3V0aWxpemF0aW9uGAIgASgBEhUKDW1pbl9pbnN0YW5j", + "ZXMYAyABKAUSFQoNbWF4X2luc3RhbmNlcxgEIAEoBSJ5CgdOZXR3b3JrEhcK", + "D2ZvcndhcmRlZF9wb3J0cxgBIAMoCRIUCgxpbnN0YW5jZV90YWcYAiABKAkS", + "DAoEbmFtZRgDIAEoCRIXCg9zdWJuZXR3b3JrX25hbWUYBCABKAkSGAoQc2Vz", + "c2lvbl9hZmZpbml0eRgFIAEoCCI8CgZWb2x1bWUSDAoEbmFtZRgBIAEoCRIT", + "Cgt2b2x1bWVfdHlwZRgCIAEoCRIPCgdzaXplX2diGAMgASgBIoUBCglSZXNv", + "dXJjZXMSCwoDY3B1GAEgASgBEg8KB2Rpc2tfZ2IYAiABKAESEQoJbWVtb3J5", + "X2diGAMgASgBEiwKB3ZvbHVtZXMYBCADKAsyGy5nb29nbGUuYXBwZW5naW5l", + "LnYxLlZvbHVtZRIZChFrbXNfa2V5X3JlZmVyZW5jZRgFIAEoCSIiChJWcGNB", + "Y2Nlc3NDb25uZWN0b3ISDAoEbmFtZRgBIAEoCSIoCgpFbnRyeXBvaW50Eg8K", + "BXNoZWxsGAEgASgJSABCCQoHY29tbWFuZCq7AgoSSW5ib3VuZFNlcnZpY2VU", + "eXBlEh8KG0lOQk9VTkRfU0VSVklDRV9VTlNQRUNJRklFRBAAEhgKFElOQk9V", + "TkRfU0VSVklDRV9NQUlMEAESHwobSU5CT1VORF9TRVJWSUNFX01BSUxfQk9V", + "TkNFEAISHgoaSU5CT1VORF9TRVJWSUNFX1hNUFBfRVJST1IQAxIgChxJTkJP", + "VU5EX1NFUlZJQ0VfWE1QUF9NRVNTQUdFEAQSIgoeSU5CT1VORF9TRVJWSUNF", + "X1hNUFBfU1VCU0NSSUJFEAUSIQodSU5CT1VORF9TRVJWSUNFX1hNUFBfUFJF", + "U0VOQ0UQBhIkCiBJTkJPVU5EX1NFUlZJQ0VfQ0hBTk5FTF9QUkVTRU5DRRAH", + "EhoKFklOQk9VTkRfU0VSVklDRV9XQVJNVVAQCSpJCg1TZXJ2aW5nU3RhdHVz", + "Eh4KGlNFUlZJTkdfU1RBVFVTX1VOU1BFQ0lGSUVEEAASCwoHU0VSVklORxAB", + "EgsKB1NUT1BQRUQQAkK+AQoXY29tLmdvb2dsZS5hcHBlbmdpbmUudjFCDFZl", + "cnNpb25Qcm90b1ABWjxnb29nbGUuZ29sYW5nLm9yZy9nZW5wcm90by9nb29n", + "bGVhcGlzL2FwcGVuZ2luZS92MTthcHBlbmdpbmWqAhlHb29nbGUuQ2xvdWQu", + "QXBwRW5naW5lLlYxygIZR29vZ2xlXENsb3VkXEFwcEVuZ2luZVxWMeoCHEdv", + "b2dsZTo6Q2xvdWQ6OkFwcEVuZ2luZTo6VjFiBnByb3RvMw==")); descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData, - new pbr::FileDescriptor[] { global::Google.Cloud.AppEngine.V1.AppYamlReflection.Descriptor, global::Google.Cloud.AppEngine.V1.DeployReflection.Descriptor, global::Google.Protobuf.WellKnownTypes.DurationReflection.Descriptor, global::Google.Protobuf.WellKnownTypes.TimestampReflection.Descriptor, global::Google.Api.AnnotationsReflection.Descriptor, }, + new pbr::FileDescriptor[] { global::Google.Cloud.AppEngine.V1.AppYamlReflection.Descriptor, global::Google.Cloud.AppEngine.V1.DeployReflection.Descriptor, global::Google.Cloud.AppEngine.V1.NetworkSettingsReflection.Descriptor, global::Google.Protobuf.WellKnownTypes.DurationReflection.Descriptor, global::Google.Protobuf.WellKnownTypes.TimestampReflection.Descriptor, global::Google.Api.AnnotationsReflection.Descriptor, }, new pbr::GeneratedClrTypeInfo(new[] {typeof(global::Google.Cloud.AppEngine.V1.InboundServiceType), typeof(global::Google.Cloud.AppEngine.V1.ServingStatus), }, null, new pbr::GeneratedClrTypeInfo[] { - new pbr::GeneratedClrTypeInfo(typeof(global::Google.Cloud.AppEngine.V1.Version), global::Google.Cloud.AppEngine.V1.Version.Parser, new[]{ "Name", "Id", "AutomaticScaling", "BasicScaling", "ManualScaling", "InboundServices", "InstanceClass", "Network", "Zones", "Resources", "Runtime", "RuntimeChannel", "Threadsafe", "Vm", "BetaSettings", "Env", "ServingStatus", "CreatedBy", "CreateTime", "DiskUsageBytes", "RuntimeApiVersion", "RuntimeMainExecutablePath", "Handlers", "ErrorHandlers", "Libraries", "ApiConfig", "EnvVariables", "DefaultExpiration", "HealthCheck", "ReadinessCheck", "LivenessCheck", "NobuildFilesRegex", "Deployment", "VersionUrl", "EndpointsApiService", "Entrypoint", "VpcAccessConnector" }, new[]{ "Scaling" }, null, null, new pbr::GeneratedClrTypeInfo[] { null, null, }), + new pbr::GeneratedClrTypeInfo(typeof(global::Google.Cloud.AppEngine.V1.Version), global::Google.Cloud.AppEngine.V1.Version.Parser, new[]{ "Name", "Id", "AutomaticScaling", "BasicScaling", "ManualScaling", "InboundServices", "InstanceClass", "Network", "Zones", "Resources", "Runtime", "RuntimeChannel", "Threadsafe", "Vm", "BetaSettings", "Env", "ServingStatus", "CreatedBy", "CreateTime", "DiskUsageBytes", "RuntimeApiVersion", "RuntimeMainExecutablePath", "ServiceAccount", "Handlers", "ErrorHandlers", "Libraries", "ApiConfig", "EnvVariables", "BuildEnvVariables", "DefaultExpiration", "HealthCheck", "ReadinessCheck", "LivenessCheck", "NobuildFilesRegex", "Deployment", "VersionUrl", "EndpointsApiService", "Entrypoint", "VpcAccessConnector" }, new[]{ "Scaling" }, null, null, new pbr::GeneratedClrTypeInfo[] { null, null, null, }), new pbr::GeneratedClrTypeInfo(typeof(global::Google.Cloud.AppEngine.V1.EndpointsApiService), global::Google.Cloud.AppEngine.V1.EndpointsApiService.Parser, new[]{ "Name", "ConfigId", "RolloutStrategy", "DisableTraceSampling" }, null, new[]{ typeof(global::Google.Cloud.AppEngine.V1.EndpointsApiService.Types.RolloutStrategy) }, null, null), new pbr::GeneratedClrTypeInfo(typeof(global::Google.Cloud.AppEngine.V1.AutomaticScaling), global::Google.Cloud.AppEngine.V1.AutomaticScaling.Parser, new[]{ "CoolDownPeriod", "CpuUtilization", "MaxConcurrentRequests", "MaxIdleInstances", "MaxTotalInstances", "MaxPendingLatency", "MinIdleInstances", "MinTotalInstances", "MinPendingLatency", "RequestUtilization", "DiskUtilization", "NetworkUtilization", "StandardSchedulerSettings" }, null, null, null, null), new pbr::GeneratedClrTypeInfo(typeof(global::Google.Cloud.AppEngine.V1.BasicScaling), global::Google.Cloud.AppEngine.V1.BasicScaling.Parser, new[]{ "IdleTimeout", "MaxInstances" }, null, null, null, null), @@ -144,7 +149,7 @@ public static partial class VersionReflection { new pbr::GeneratedClrTypeInfo(typeof(global::Google.Cloud.AppEngine.V1.StandardSchedulerSettings), global::Google.Cloud.AppEngine.V1.StandardSchedulerSettings.Parser, new[]{ "TargetCpuUtilization", "TargetThroughputUtilization", "MinInstances", "MaxInstances" }, null, null, null, null), new pbr::GeneratedClrTypeInfo(typeof(global::Google.Cloud.AppEngine.V1.Network), global::Google.Cloud.AppEngine.V1.Network.Parser, new[]{ "ForwardedPorts", "InstanceTag", "Name", "SubnetworkName", "SessionAffinity" }, null, null, null, null), new pbr::GeneratedClrTypeInfo(typeof(global::Google.Cloud.AppEngine.V1.Volume), global::Google.Cloud.AppEngine.V1.Volume.Parser, new[]{ "Name", "VolumeType", "SizeGb" }, null, null, null, null), - new pbr::GeneratedClrTypeInfo(typeof(global::Google.Cloud.AppEngine.V1.Resources), global::Google.Cloud.AppEngine.V1.Resources.Parser, new[]{ "Cpu", "DiskGb", "MemoryGb", "Volumes" }, null, null, null, null), + new pbr::GeneratedClrTypeInfo(typeof(global::Google.Cloud.AppEngine.V1.Resources), global::Google.Cloud.AppEngine.V1.Resources.Parser, new[]{ "Cpu", "DiskGb", "MemoryGb", "Volumes", "KmsKeyReference" }, null, null, null, null), new pbr::GeneratedClrTypeInfo(typeof(global::Google.Cloud.AppEngine.V1.VpcAccessConnector), global::Google.Cloud.AppEngine.V1.VpcAccessConnector.Parser, new[]{ "Name" }, null, null, null, null), new pbr::GeneratedClrTypeInfo(typeof(global::Google.Cloud.AppEngine.V1.Entrypoint), global::Google.Cloud.AppEngine.V1.Entrypoint.Parser, new[]{ "Shell" }, new[]{ "Command" }, null, null, null) })); @@ -272,11 +277,13 @@ public sealed partial class Version : pb::IMessage diskUsageBytes_ = other.diskUsageBytes_; runtimeApiVersion_ = other.runtimeApiVersion_; runtimeMainExecutablePath_ = other.runtimeMainExecutablePath_; + serviceAccount_ = other.serviceAccount_; handlers_ = other.handlers_.Clone(); errorHandlers_ = other.errorHandlers_.Clone(); libraries_ = other.libraries_.Clone(); apiConfig_ = other.apiConfig_ != null ? other.apiConfig_.Clone() : null; envVariables_ = other.envVariables_.Clone(); + buildEnvVariables_ = other.buildEnvVariables_.Clone(); defaultExpiration_ = other.defaultExpiration_ != null ? other.defaultExpiration_.Clone() : null; healthCheck_ = other.healthCheck_ != null ? other.healthCheck_.Clone() : null; readinessCheck_ = other.readinessCheck_ != null ? other.readinessCheck_.Clone() : null; @@ -344,7 +351,8 @@ public sealed partial class Version : pb::IMessage public const int AutomaticScalingFieldNumber = 3; /// /// Automatic scaling is based on request rate, response latencies, and other - /// application metrics. + /// application metrics. Instances are dynamically created and destroyed as + /// needed in order to handle traffic. /// [global::System.Diagnostics.DebuggerNonUserCodeAttribute] public global::Google.Cloud.AppEngine.V1.AutomaticScaling AutomaticScaling { @@ -377,6 +385,7 @@ public sealed partial class Version : pb::IMessage /// /// A service with manual scaling runs continuously, allowing you to perform /// complex initialization and rely on the state of its memory over time. + /// Manually scaled versions are sometimes referred to as "backends". /// [global::System.Diagnostics.DebuggerNonUserCodeAttribute] public global::Google.Cloud.AppEngine.V1.ManualScaling ManualScaling { @@ -648,6 +657,22 @@ public sealed partial class Version : pb::IMessage } } + /// Field number for the "service_account" field. + public const int ServiceAccountFieldNumber = 127; + private string serviceAccount_ = ""; + /// + /// The identity that the deployed version will run as. + /// Admin API will use the App Engine Appspot service account as default if + /// this field is neither provided in app.yaml file nor through CLI flag. + /// + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public string ServiceAccount { + get { return serviceAccount_; } + set { + serviceAccount_ = pb::ProtoPreconditions.CheckNotNull(value, "value"); + } + } + /// Field number for the "handlers" field. public const int HandlersFieldNumber = 100; private static readonly pb::FieldCodec _repeated_handlers_codec @@ -728,6 +753,21 @@ public sealed partial class Version : pb::IMessage get { return envVariables_; } } + /// Field number for the "build_env_variables" field. + public const int BuildEnvVariablesFieldNumber = 125; + private static readonly pbc::MapField.Codec _map_buildEnvVariables_codec + = new pbc::MapField.Codec(pb::FieldCodec.ForString(10, ""), pb::FieldCodec.ForString(18, ""), 1002); + private readonly pbc::MapField buildEnvVariables_ = new pbc::MapField(); + /// + /// Environment variables available to the build environment. + /// + /// Only returned in `GET` requests if `view=FULL` is set. + /// + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public pbc::MapField BuildEnvVariables { + get { return buildEnvVariables_; } + } + /// Field number for the "default_expiration" field. public const int DefaultExpirationFieldNumber = 105; private global::Google.Protobuf.WellKnownTypes.Duration defaultExpiration_; @@ -949,11 +989,13 @@ public enum ScalingOneofCase { if (DiskUsageBytes != other.DiskUsageBytes) return false; if (RuntimeApiVersion != other.RuntimeApiVersion) return false; if (RuntimeMainExecutablePath != other.RuntimeMainExecutablePath) return false; + if (ServiceAccount != other.ServiceAccount) return false; if(!handlers_.Equals(other.handlers_)) return false; if(!errorHandlers_.Equals(other.errorHandlers_)) return false; if(!libraries_.Equals(other.libraries_)) return false; if (!object.Equals(ApiConfig, other.ApiConfig)) return false; if (!EnvVariables.Equals(other.EnvVariables)) return false; + if (!BuildEnvVariables.Equals(other.BuildEnvVariables)) return false; if (!object.Equals(DefaultExpiration, other.DefaultExpiration)) return false; if (!object.Equals(HealthCheck, other.HealthCheck)) return false; if (!object.Equals(ReadinessCheck, other.ReadinessCheck)) return false; @@ -993,11 +1035,13 @@ public enum ScalingOneofCase { if (DiskUsageBytes != 0L) hash ^= DiskUsageBytes.GetHashCode(); if (RuntimeApiVersion.Length != 0) hash ^= RuntimeApiVersion.GetHashCode(); if (RuntimeMainExecutablePath.Length != 0) hash ^= RuntimeMainExecutablePath.GetHashCode(); + if (ServiceAccount.Length != 0) hash ^= ServiceAccount.GetHashCode(); hash ^= handlers_.GetHashCode(); hash ^= errorHandlers_.GetHashCode(); hash ^= libraries_.GetHashCode(); if (apiConfig_ != null) hash ^= ApiConfig.GetHashCode(); hash ^= EnvVariables.GetHashCode(); + hash ^= BuildEnvVariables.GetHashCode(); if (defaultExpiration_ != null) hash ^= DefaultExpiration.GetHashCode(); if (healthCheck_ != null) hash ^= HealthCheck.GetHashCode(); if (readinessCheck_ != null) hash ^= ReadinessCheck.GetHashCode(); @@ -1152,6 +1196,11 @@ public enum ScalingOneofCase { output.WriteRawTag(210, 7); output.WriteMessage(Entrypoint); } + buildEnvVariables_.WriteTo(output, _map_buildEnvVariables_codec); + if (ServiceAccount.Length != 0) { + output.WriteRawTag(250, 7); + output.WriteString(ServiceAccount); + } if (_unknownFields != null) { _unknownFields.WriteTo(output); } @@ -1288,6 +1337,11 @@ public enum ScalingOneofCase { output.WriteRawTag(210, 7); output.WriteMessage(Entrypoint); } + buildEnvVariables_.WriteTo(ref output, _map_buildEnvVariables_codec); + if (ServiceAccount.Length != 0) { + output.WriteRawTag(250, 7); + output.WriteString(ServiceAccount); + } if (_unknownFields != null) { _unknownFields.WriteTo(ref output); } @@ -1357,6 +1411,9 @@ public enum ScalingOneofCase { if (RuntimeMainExecutablePath.Length != 0) { size += 2 + pb::CodedOutputStream.ComputeStringSize(RuntimeMainExecutablePath); } + if (ServiceAccount.Length != 0) { + size += 2 + pb::CodedOutputStream.ComputeStringSize(ServiceAccount); + } size += handlers_.CalculateSize(_repeated_handlers_codec); size += errorHandlers_.CalculateSize(_repeated_errorHandlers_codec); size += libraries_.CalculateSize(_repeated_libraries_codec); @@ -1364,6 +1421,7 @@ public enum ScalingOneofCase { size += 2 + pb::CodedOutputStream.ComputeMessageSize(ApiConfig); } size += envVariables_.CalculateSize(_map_envVariables_codec); + size += buildEnvVariables_.CalculateSize(_map_buildEnvVariables_codec); if (defaultExpiration_ != null) { size += 2 + pb::CodedOutputStream.ComputeMessageSize(DefaultExpiration); } @@ -1465,6 +1523,9 @@ public enum ScalingOneofCase { if (other.RuntimeMainExecutablePath.Length != 0) { RuntimeMainExecutablePath = other.RuntimeMainExecutablePath; } + if (other.ServiceAccount.Length != 0) { + ServiceAccount = other.ServiceAccount; + } handlers_.Add(other.handlers_); errorHandlers_.Add(other.errorHandlers_); libraries_.Add(other.libraries_); @@ -1475,6 +1536,7 @@ public enum ScalingOneofCase { ApiConfig.MergeFrom(other.ApiConfig); } envVariables_.Add(other.envVariables_); + buildEnvVariables_.Add(other.buildEnvVariables_); if (other.defaultExpiration_ != null) { if (defaultExpiration_ == null) { DefaultExpiration = new global::Google.Protobuf.WellKnownTypes.Duration(); @@ -1764,6 +1826,14 @@ public enum ScalingOneofCase { input.ReadMessage(Entrypoint); break; } + case 1002: { + buildEnvVariables_.AddEntriesFrom(input, _map_buildEnvVariables_codec); + break; + } + case 1018: { + ServiceAccount = input.ReadString(); + break; + } } } #endif @@ -1978,6 +2048,14 @@ public enum ScalingOneofCase { input.ReadMessage(Entrypoint); break; } + case 1002: { + buildEnvVariables_.AddEntriesFrom(ref input, _map_buildEnvVariables_codec); + break; + } + case 1018: { + ServiceAccount = input.ReadString(); + break; + } } } } @@ -5446,6 +5524,7 @@ public sealed partial class Resources : pb::IMessage diskGb_ = other.diskGb_; memoryGb_ = other.memoryGb_; volumes_ = other.volumes_.Clone(); + kmsKeyReference_ = other.kmsKeyReference_; _unknownFields = pb::UnknownFieldSet.Clone(other._unknownFields); } @@ -5509,6 +5588,21 @@ public sealed partial class Resources : pb::IMessage get { return volumes_; } } + /// Field number for the "kms_key_reference" field. + public const int KmsKeyReferenceFieldNumber = 5; + private string kmsKeyReference_ = ""; + /// + /// The name of the encryption key that is stored in Google Cloud KMS. + /// Only should be used by Cloud Composer to encrypt the vm disk + /// + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public string KmsKeyReference { + get { return kmsKeyReference_; } + set { + kmsKeyReference_ = pb::ProtoPreconditions.CheckNotNull(value, "value"); + } + } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] public override bool Equals(object other) { return Equals(other as Resources); @@ -5526,6 +5620,7 @@ public sealed partial class Resources : pb::IMessage if (!pbc::ProtobufEqualityComparers.BitwiseDoubleEqualityComparer.Equals(DiskGb, other.DiskGb)) return false; if (!pbc::ProtobufEqualityComparers.BitwiseDoubleEqualityComparer.Equals(MemoryGb, other.MemoryGb)) return false; if(!volumes_.Equals(other.volumes_)) return false; + if (KmsKeyReference != other.KmsKeyReference) return false; return Equals(_unknownFields, other._unknownFields); } @@ -5536,6 +5631,7 @@ public sealed partial class Resources : pb::IMessage if (DiskGb != 0D) hash ^= pbc::ProtobufEqualityComparers.BitwiseDoubleEqualityComparer.GetHashCode(DiskGb); if (MemoryGb != 0D) hash ^= pbc::ProtobufEqualityComparers.BitwiseDoubleEqualityComparer.GetHashCode(MemoryGb); hash ^= volumes_.GetHashCode(); + if (KmsKeyReference.Length != 0) hash ^= KmsKeyReference.GetHashCode(); if (_unknownFields != null) { hash ^= _unknownFields.GetHashCode(); } @@ -5565,6 +5661,10 @@ public sealed partial class Resources : pb::IMessage output.WriteDouble(MemoryGb); } volumes_.WriteTo(output, _repeated_volumes_codec); + if (KmsKeyReference.Length != 0) { + output.WriteRawTag(42); + output.WriteString(KmsKeyReference); + } if (_unknownFields != null) { _unknownFields.WriteTo(output); } @@ -5587,6 +5687,10 @@ public sealed partial class Resources : pb::IMessage output.WriteDouble(MemoryGb); } volumes_.WriteTo(ref output, _repeated_volumes_codec); + if (KmsKeyReference.Length != 0) { + output.WriteRawTag(42); + output.WriteString(KmsKeyReference); + } if (_unknownFields != null) { _unknownFields.WriteTo(ref output); } @@ -5606,6 +5710,9 @@ public sealed partial class Resources : pb::IMessage size += 1 + 8; } size += volumes_.CalculateSize(_repeated_volumes_codec); + if (KmsKeyReference.Length != 0) { + size += 1 + pb::CodedOutputStream.ComputeStringSize(KmsKeyReference); + } if (_unknownFields != null) { size += _unknownFields.CalculateSize(); } @@ -5627,6 +5734,9 @@ public sealed partial class Resources : pb::IMessage MemoryGb = other.MemoryGb; } volumes_.Add(other.volumes_); + if (other.KmsKeyReference.Length != 0) { + KmsKeyReference = other.KmsKeyReference; + } _unknownFields = pb::UnknownFieldSet.MergeFrom(_unknownFields, other._unknownFields); } @@ -5657,6 +5767,10 @@ public sealed partial class Resources : pb::IMessage volumes_.AddEntriesFrom(input, _repeated_volumes_codec); break; } + case 42: { + KmsKeyReference = input.ReadString(); + break; + } } } #endif @@ -5687,6 +5801,10 @@ public sealed partial class Resources : pb::IMessage volumes_.AddEntriesFrom(ref input, _repeated_volumes_codec); break; } + case 42: { + KmsKeyReference = input.ReadString(); + break; + } } } } diff --git a/apis/Google.Cloud.AppEngine.V1/Google.Cloud.AppEngine.V1/VersionsClient.g.cs b/apis/Google.Cloud.AppEngine.V1/Google.Cloud.AppEngine.V1/VersionsClient.g.cs index 59786b9a3ebd..c5916e8aa659 100644 --- a/apis/Google.Cloud.AppEngine.V1/Google.Cloud.AppEngine.V1/VersionsClient.g.cs +++ b/apis/Google.Cloud.AppEngine.V1/Google.Cloud.AppEngine.V1/VersionsClient.g.cs @@ -66,10 +66,10 @@ private VersionsSettings(VersionsSettings existing) : base(existing) /// /// /// This call will not be retried. - /// No timeout is applied. + /// Timeout: 60 seconds. /// /// - public gaxgrpc::CallSettings ListVersionsSettings { get; set; } = gaxgrpc::CallSettings.FromExpiration(gax::Expiration.None); + public gaxgrpc::CallSettings ListVersionsSettings { get; set; } = gaxgrpc::CallSettings.FromExpiration(gax::Expiration.FromTimeout(sys::TimeSpan.FromMilliseconds(60000))); /// /// for synchronous and asynchronous calls to VersionsClient.GetVersion @@ -78,10 +78,10 @@ private VersionsSettings(VersionsSettings existing) : base(existing) /// /// /// This call will not be retried. - /// No timeout is applied. + /// Timeout: 60 seconds. /// /// - public gaxgrpc::CallSettings GetVersionSettings { get; set; } = gaxgrpc::CallSettings.FromExpiration(gax::Expiration.None); + public gaxgrpc::CallSettings GetVersionSettings { get; set; } = gaxgrpc::CallSettings.FromExpiration(gax::Expiration.FromTimeout(sys::TimeSpan.FromMilliseconds(60000))); /// /// for synchronous and asynchronous calls to @@ -90,10 +90,10 @@ private VersionsSettings(VersionsSettings existing) : base(existing) /// /// /// This call will not be retried. - /// No timeout is applied. + /// Timeout: 60 seconds. /// /// - public gaxgrpc::CallSettings CreateVersionSettings { get; set; } = gaxgrpc::CallSettings.FromExpiration(gax::Expiration.None); + public gaxgrpc::CallSettings CreateVersionSettings { get; set; } = gaxgrpc::CallSettings.FromExpiration(gax::Expiration.FromTimeout(sys::TimeSpan.FromMilliseconds(60000))); /// /// Long Running Operation settings for calls to VersionsClient.CreateVersion and @@ -120,10 +120,10 @@ private VersionsSettings(VersionsSettings existing) : base(existing) /// /// /// This call will not be retried. - /// No timeout is applied. + /// Timeout: 60 seconds. /// /// - public gaxgrpc::CallSettings UpdateVersionSettings { get; set; } = gaxgrpc::CallSettings.FromExpiration(gax::Expiration.None); + public gaxgrpc::CallSettings UpdateVersionSettings { get; set; } = gaxgrpc::CallSettings.FromExpiration(gax::Expiration.FromTimeout(sys::TimeSpan.FromMilliseconds(60000))); /// /// Long Running Operation settings for calls to VersionsClient.UpdateVersion and @@ -150,10 +150,10 @@ private VersionsSettings(VersionsSettings existing) : base(existing) /// /// /// This call will not be retried. - /// No timeout is applied. + /// Timeout: 60 seconds. /// /// - public gaxgrpc::CallSettings DeleteVersionSettings { get; set; } = gaxgrpc::CallSettings.FromExpiration(gax::Expiration.None); + public gaxgrpc::CallSettings DeleteVersionSettings { get; set; } = gaxgrpc::CallSettings.FromExpiration(gax::Expiration.FromTimeout(sys::TimeSpan.FromMilliseconds(60000))); /// /// Long Running Operation settings for calls to VersionsClient.DeleteVersion and diff --git a/apis/Google.Cloud.AppEngine.V1/synth.metadata b/apis/Google.Cloud.AppEngine.V1/synth.metadata index d01ffadcf79e..5dc11ec4aa7d 100644 --- a/apis/Google.Cloud.AppEngine.V1/synth.metadata +++ b/apis/Google.Cloud.AppEngine.V1/synth.metadata @@ -4,7 +4,7 @@ "git": { "name": "googleapis", "remote": "https://github.com/googleapis/googleapis.git", - "sha": "ad3bb00ed7750cd0625b3a36e0e2eff29f778e4a" + "sha": "a0d282daa691e95ec51131c81c3777fc95abf7f8" } } ]