Skip to content

Commit

Permalink
feat: add Application.service_account (#130)
Browse files Browse the repository at this point in the history
* 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

Source-Link: googleapis/googleapis@cd7a3e5

Source-Link: googleapis/googleapis-gen@0e7d6d2
Copy-Tag: eyJwIjoiLmdpdGh1Yi8uT3dsQm90LnlhbWwiLCJoIjoiMGU3ZDZkMjA1NWVhMmVhNDhjZWZkOGFiYjk3ZjdmNjZlOWIwZTFhNyJ9

* 🦉 Updates from OwlBot post-processor

See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md

Co-authored-by: Owl Bot <gcf-owl-bot[bot]@users.noreply.github.com>
  • Loading branch information
gcf-owl-bot[bot] and gcf-owl-bot[bot] authored May 7, 2022
1 parent b8597dd commit 249b4b0
Show file tree
Hide file tree
Showing 20 changed files with 9,882 additions and 9,615 deletions.
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Copyright 2021 Google LLC
// Copyright 2022 Google LLC
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
Expand Down
617 changes: 310 additions & 307 deletions packages/google-appengine/protos/google/appengine/v1/appengine.proto

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Copyright 2021 Google LLC
// Copyright 2022 Google LLC
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
Expand Down Expand Up @@ -29,6 +29,20 @@ option ruby_package = "Google::Cloud::AppEngine::V1";
// An Application resource contains the top-level configuration of an App
// Engine application.
message Application {
enum ServingStatus {
// Serving status is unspecified.
UNSPECIFIED = 0;

// Application is serving.
SERVING = 1;

// Application has been disabled by the user.
USER_DISABLED = 2;

// Application has been disabled by the system.
SYSTEM_DISABLED = 3;
}

// Identity-Aware Proxy
message IdentityAwareProxy {
// Whether the serving infrastructure will authenticate and
Expand Down Expand Up @@ -56,6 +70,20 @@ message Application {
string oauth2_client_secret_sha256 = 4;
}

enum DatabaseType {
// Database type is unspecified.
DATABASE_TYPE_UNSPECIFIED = 0;

// Cloud Datastore
CLOUD_DATASTORE = 1;

// Cloud Firestore Native
CLOUD_FIRESTORE = 2;

// Cloud Firestore in Datastore Mode
CLOUD_DATASTORE_COMPATIBILITY = 3;
}

// The feature specific settings to be used in the application. These define
// behaviors that are user configurable.
message FeatureSettings {
Expand All @@ -72,34 +100,6 @@ message Application {
bool use_container_optimized_os = 2;
}

enum ServingStatus {
// Serving status is unspecified.
UNSPECIFIED = 0;

// Application is serving.
SERVING = 1;

// Application has been disabled by the user.
USER_DISABLED = 2;

// Application has been disabled by the system.
SYSTEM_DISABLED = 3;
}

enum DatabaseType {
// Database type is unspecified.
DATABASE_TYPE_UNSPECIFIED = 0;

// Cloud Datastore
CLOUD_DATASTORE = 1;

// Cloud Firestore Native
CLOUD_FIRESTORE = 2;

// Cloud Firestore in Datastore Mode
CLOUD_DATASTORE_COMPATIBILITY = 3;
}

// Full path to the Application resource in the API.
// Example: `apps/myapp`.
//
Expand Down Expand Up @@ -157,6 +157,11 @@ message Application {
// @OutputOnly
string default_bucket = 12;

// The service account associated with the application.
// This is the app-level default identity. If no identity provided during
// create version, Admin API will fallback to this one.
string service_account = 13;

IdentityAwareProxy iap = 14;

// The Google Container Registry domain used for storing managed build docker
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Copyright 2021 Google LLC
// Copyright 2022 Google LLC
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
Expand Down
20 changes: 10 additions & 10 deletions packages/google-appengine/protos/google/appengine/v1/instance.proto
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Copyright 2021 Google LLC
// Copyright 2022 Google LLC
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
Expand Down Expand Up @@ -36,6 +36,15 @@ message Instance {
pattern: "apps/{app}/services/{service}/versions/{version}/instances/{instance}"
};

// Availability of the instance.
enum Availability {
UNSPECIFIED = 0;

RESIDENT = 1;

DYNAMIC = 2;
}

// Wrapper for LivenessState enum.
message Liveness {
// Liveness health check status for Flex instances.
Expand Down Expand Up @@ -70,15 +79,6 @@ message Instance {

}

// Availability of the instance.
enum Availability {
UNSPECIFIED = 0;

RESIDENT = 1;

DYNAMIC = 2;
}

// Output only. Full path to the Instance resource in the API.
// Example: `apps/myapp/services/default/versions/v1/instances/instance-1`.
string name = 1 [(google.api.field_behavior) = OUTPUT_ONLY];
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Copyright 2021 Google LLC
// Copyright 2022 Google LLC
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Copyright 2021 Google LLC
// Copyright 2022 Google LLC
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Copyright 2021 Google LLC
// Copyright 2022 Google LLC
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Copyright 2021 Google LLC
// Copyright 2022 Google LLC
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
Expand Down Expand Up @@ -50,6 +50,19 @@ message Service {
// different versions within the service.
TrafficSplit split = 3;

// A set of labels to apply to this service. Labels are key/value pairs that
// describe the service and all resources that belong to it (e.g.,
// versions). The labels can be used to search and group resources, and are
// propagated to the usage and billing reports, enabling fine-grain analysis
// of costs. An example of using labels is to tag resources belonging to
// different environments (e.g., "env=prod", "env=qa").
//
// <p>Label keys and values can be no longer than 63 characters and can only
// contain lowercase letters, numeric characters, underscores, dashes, and
// international characters. Label keys must start with a lowercase letter
// or an international character. Each service can have at most 32 labels.
map<string, string> labels = 4;

// Ingress settings for this service. Will apply to all versions.
NetworkSettings network_settings = 6;
}
Expand Down
56 changes: 39 additions & 17 deletions packages/google-appengine/protos/google/appengine/v1/version.proto
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Copyright 2021 Google LLC
// Copyright 2022 Google LLC
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
Expand Down Expand Up @@ -102,6 +102,10 @@ message Version {
// Whether to deploy this version in a container on a virtual machine.
bool vm = 12;

// Allows App Engine second generation runtimes to access the legacy bundled
// services.
bool app_engine_apis = 128;

// Metadata settings that are supplied to this version to enable
// beta runtime features.
map<string, string> beta_settings = 13;
Expand Down Expand Up @@ -509,22 +513,6 @@ message Resources {
string kms_key_reference = 5;
}

// VPC access connector specification.
message VpcAccessConnector {
// Full Serverless VPC Access Connector name e.g.
// /projects/my-project/locations/us-central1/connectors/c1.
string name = 1;
}

// The entrypoint for the application.
message Entrypoint {
// The command to run.
oneof command {
// The format should be a shell command that can be fed to `bash -c`.
string shell = 1;
}
}

// Available inbound services.
enum InboundServiceType {
// Not specified.
Expand Down Expand Up @@ -570,3 +558,37 @@ enum ServingStatus {
// to `SERVING`.
STOPPED = 2;
}

// VPC access connector specification.
message VpcAccessConnector {
// Available egress settings.
//
// This controls what traffic is diverted through the VPC Access Connector
// resource. By default PRIVATE_IP_RANGES will be used.
enum EgressSetting {
EGRESS_SETTING_UNSPECIFIED = 0;

// Force the use of VPC Access for all egress traffic from the function.
ALL_TRAFFIC = 1;

// Use the VPC Access Connector for private IP space from RFC1918.
PRIVATE_IP_RANGES = 2;
}

// Full Serverless VPC Access Connector name e.g.
// /projects/my-project/locations/us-central1/connectors/c1.
string name = 1;

// The egress setting for the connector, controlling what traffic is diverted
// through it.
EgressSetting egress_setting = 2;
}

// The entrypoint for the application.
message Entrypoint {
// The command to run.
oneof command {
// The format should be a shell command that can be fed to `bash -c`.
string shell = 1;
}
}
Loading

0 comments on commit 249b4b0

Please sign in to comment.