Skip to content

Commit cd7a3e5

Browse files
Google APIscopybara-github
Google APIs
authored and
copybara-github
committed
feat: add Application.service_account
feat: add client library method signature to retrieve Application by name feat: add Service.labels feat: add Version.app_engine_apis feat: add VpcAccessConnector.egress_setting PiperOrigin-RevId: 446641753
1 parent e24febc commit cd7a3e5

11 files changed

Lines changed: 418 additions & 369 deletions

‎google/appengine/v1/app_yaml.proto‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Copyright 2021 Google LLC
1+
// Copyright 2022 Google LLC
22
//
33
// Licensed under the Apache License, Version 2.0 (the "License");
44
// you may not use this file except in compliance with the License.

‎google/appengine/v1/appengine.proto‎

Lines changed: 310 additions & 307 deletions
Large diffs are not rendered by default.

‎google/appengine/v1/appengine_v1.yaml‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,10 +46,16 @@ backend:
4646
deadline: 30.0
4747
- selector: 'google.appengine.v1.AuthorizedCertificates.*'
4848
deadline: 30.0
49+
- selector: google.appengine.v1.AuthorizedCertificates.GetAuthorizedCertificate
50+
deadline: 60.0
4951
- selector: google.appengine.v1.AuthorizedDomains.ListAuthorizedDomains
5052
deadline: 30.0
5153
- selector: 'google.appengine.v1.DomainMappings.*'
5254
deadline: 30.0
55+
- selector: google.appengine.v1.DomainMappings.GetDomainMapping
56+
deadline: 60.0
57+
- selector: google.appengine.v1.DomainMappings.ListDomainMappings
58+
deadline: 60.0
5359
- selector: 'google.appengine.v1.Firewall.*'
5460
deadline: 30.0
5561
- selector: 'google.appengine.v1.Instances.*'

‎google/appengine/v1/application.proto‎

Lines changed: 34 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Copyright 2021 Google LLC
1+
// Copyright 2022 Google LLC
22
//
33
// Licensed under the Apache License, Version 2.0 (the "License");
44
// you may not use this file except in compliance with the License.
@@ -29,6 +29,20 @@ option ruby_package = "Google::Cloud::AppEngine::V1";
2929
// An Application resource contains the top-level configuration of an App
3030
// Engine application.
3131
message Application {
32+
enum ServingStatus {
33+
// Serving status is unspecified.
34+
UNSPECIFIED = 0;
35+
36+
// Application is serving.
37+
SERVING = 1;
38+
39+
// Application has been disabled by the user.
40+
USER_DISABLED = 2;
41+
42+
// Application has been disabled by the system.
43+
SYSTEM_DISABLED = 3;
44+
}
45+
3246
// Identity-Aware Proxy
3347
message IdentityAwareProxy {
3448
// Whether the serving infrastructure will authenticate and
@@ -56,6 +70,20 @@ message Application {
5670
string oauth2_client_secret_sha256 = 4;
5771
}
5872

73+
enum DatabaseType {
74+
// Database type is unspecified.
75+
DATABASE_TYPE_UNSPECIFIED = 0;
76+
77+
// Cloud Datastore
78+
CLOUD_DATASTORE = 1;
79+
80+
// Cloud Firestore Native
81+
CLOUD_FIRESTORE = 2;
82+
83+
// Cloud Firestore in Datastore Mode
84+
CLOUD_DATASTORE_COMPATIBILITY = 3;
85+
}
86+
5987
// The feature specific settings to be used in the application. These define
6088
// behaviors that are user configurable.
6189
message FeatureSettings {
@@ -72,34 +100,6 @@ message Application {
72100
bool use_container_optimized_os = 2;
73101
}
74102

75-
enum ServingStatus {
76-
// Serving status is unspecified.
77-
UNSPECIFIED = 0;
78-
79-
// Application is serving.
80-
SERVING = 1;
81-
82-
// Application has been disabled by the user.
83-
USER_DISABLED = 2;
84-
85-
// Application has been disabled by the system.
86-
SYSTEM_DISABLED = 3;
87-
}
88-
89-
enum DatabaseType {
90-
// Database type is unspecified.
91-
DATABASE_TYPE_UNSPECIFIED = 0;
92-
93-
// Cloud Datastore
94-
CLOUD_DATASTORE = 1;
95-
96-
// Cloud Firestore Native
97-
CLOUD_FIRESTORE = 2;
98-
99-
// Cloud Firestore in Datastore Mode
100-
CLOUD_DATASTORE_COMPATIBILITY = 3;
101-
}
102-
103103
// Full path to the Application resource in the API.
104104
// Example: `apps/myapp`.
105105
//
@@ -157,6 +157,11 @@ message Application {
157157
// @OutputOnly
158158
string default_bucket = 12;
159159

160+
// The service account associated with the application.
161+
// This is the app-level default identity. If no identity provided during
162+
// create version, Admin API will fallback to this one.
163+
string service_account = 13;
164+
160165
IdentityAwareProxy iap = 14;
161166

162167
// The Google Container Registry domain used for storing managed build docker

‎google/appengine/v1/deploy.proto‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Copyright 2021 Google LLC
1+
// Copyright 2022 Google LLC
22
//
33
// Licensed under the Apache License, Version 2.0 (the "License");
44
// you may not use this file except in compliance with the License.

‎google/appengine/v1/instance.proto‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Copyright 2021 Google LLC
1+
// Copyright 2022 Google LLC
22
//
33
// Licensed under the Apache License, Version 2.0 (the "License");
44
// you may not use this file except in compliance with the License.
@@ -36,6 +36,15 @@ message Instance {
3636
pattern: "apps/{app}/services/{service}/versions/{version}/instances/{instance}"
3737
};
3838

39+
// Availability of the instance.
40+
enum Availability {
41+
UNSPECIFIED = 0;
42+
43+
RESIDENT = 1;
44+
45+
DYNAMIC = 2;
46+
}
47+
3948
// Wrapper for LivenessState enum.
4049
message Liveness {
4150
// Liveness health check status for Flex instances.
@@ -70,15 +79,6 @@ message Instance {
7079

7180
}
7281

73-
// Availability of the instance.
74-
enum Availability {
75-
UNSPECIFIED = 0;
76-
77-
RESIDENT = 1;
78-
79-
DYNAMIC = 2;
80-
}
81-
8282
// Output only. Full path to the Instance resource in the API.
8383
// Example: `apps/myapp/services/default/versions/v1/instances/instance-1`.
8484
string name = 1 [(google.api.field_behavior) = OUTPUT_ONLY];

‎google/appengine/v1/location.proto‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Copyright 2021 Google LLC
1+
// Copyright 2022 Google LLC
22
//
33
// Licensed under the Apache License, Version 2.0 (the "License");
44
// you may not use this file except in compliance with the License.

‎google/appengine/v1/network_settings.proto‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Copyright 2021 Google LLC
1+
// Copyright 2022 Google LLC
22
//
33
// Licensed under the Apache License, Version 2.0 (the "License");
44
// you may not use this file except in compliance with the License.

‎google/appengine/v1/operation.proto‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Copyright 2021 Google LLC
1+
// Copyright 2022 Google LLC
22
//
33
// Licensed under the Apache License, Version 2.0 (the "License");
44
// you may not use this file except in compliance with the License.

‎google/appengine/v1/service.proto‎

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Copyright 2021 Google LLC
1+
// Copyright 2022 Google LLC
22
//
33
// Licensed under the Apache License, Version 2.0 (the "License");
44
// you may not use this file except in compliance with the License.
@@ -50,6 +50,19 @@ message Service {
5050
// different versions within the service.
5151
TrafficSplit split = 3;
5252

53+
// A set of labels to apply to this service. Labels are key/value pairs that
54+
// describe the service and all resources that belong to it (e.g.,
55+
// versions). The labels can be used to search and group resources, and are
56+
// propagated to the usage and billing reports, enabling fine-grain analysis
57+
// of costs. An example of using labels is to tag resources belonging to
58+
// different environments (e.g., "env=prod", "env=qa").
59+
//
60+
// <p>Label keys and values can be no longer than 63 characters and can only
61+
// contain lowercase letters, numeric characters, underscores, dashes, and
62+
// international characters. Label keys must start with a lowercase letter
63+
// or an international character. Each service can have at most 32 labels.
64+
map<string, string> labels = 4;
65+
5366
// Ingress settings for this service. Will apply to all versions.
5467
NetworkSettings network_settings = 6;
5568
}

0 commit comments

Comments
 (0)