() {
+ public SecurityLevel findValueByNumber(int number) {
+ return SecurityLevel.forNumber(number);
+ }
+ };
+
+ public final com.google.protobuf.Descriptors.EnumValueDescriptor getValueDescriptor() {
+ if (this == UNRECOGNIZED) {
+ throw new java.lang.IllegalStateException(
+ "Can't get the descriptor of an unrecognized enum value.");
+ }
+ return getDescriptor().getValues().get(ordinal());
+ }
+
+ public final com.google.protobuf.Descriptors.EnumDescriptor getDescriptorForType() {
+ return getDescriptor();
+ }
+
+ public static final com.google.protobuf.Descriptors.EnumDescriptor getDescriptor() {
+ return com.google.cloud.functions.v1.HttpsTrigger.getDescriptor().getEnumTypes().get(0);
+ }
+
+ private static final SecurityLevel[] VALUES = values();
+
+ public static SecurityLevel valueOf(com.google.protobuf.Descriptors.EnumValueDescriptor desc) {
+ if (desc.getType() != getDescriptor()) {
+ throw new java.lang.IllegalArgumentException("EnumValueDescriptor is not for this type.");
+ }
+ if (desc.getIndex() == -1) {
+ return UNRECOGNIZED;
+ }
+ return VALUES[desc.getIndex()];
+ }
+
+ private final int value;
+
+ private SecurityLevel(int value) {
+ this.value = value;
+ }
+
+ // @@protoc_insertion_point(enum_scope:google.cloud.functions.v1.HttpsTrigger.SecurityLevel)
+ }
+
public static final int URL_FIELD_NUMBER = 1;
private volatile java.lang.Object url_;
/**
@@ -160,6 +335,44 @@ public com.google.protobuf.ByteString getUrlBytes() {
}
}
+ public static final int SECURITY_LEVEL_FIELD_NUMBER = 2;
+ private int securityLevel_;
+ /**
+ *
+ *
+ *
+ * The security level for the function.
+ *
+ *
+ * .google.cloud.functions.v1.HttpsTrigger.SecurityLevel security_level = 2;
+ *
+ * @return The enum numeric value on the wire for securityLevel.
+ */
+ @java.lang.Override
+ public int getSecurityLevelValue() {
+ return securityLevel_;
+ }
+ /**
+ *
+ *
+ *
+ * The security level for the function.
+ *
+ *
+ * .google.cloud.functions.v1.HttpsTrigger.SecurityLevel security_level = 2;
+ *
+ * @return The securityLevel.
+ */
+ @java.lang.Override
+ public com.google.cloud.functions.v1.HttpsTrigger.SecurityLevel getSecurityLevel() {
+ @SuppressWarnings("deprecation")
+ com.google.cloud.functions.v1.HttpsTrigger.SecurityLevel result =
+ com.google.cloud.functions.v1.HttpsTrigger.SecurityLevel.valueOf(securityLevel_);
+ return result == null
+ ? com.google.cloud.functions.v1.HttpsTrigger.SecurityLevel.UNRECOGNIZED
+ : result;
+ }
+
private byte memoizedIsInitialized = -1;
@java.lang.Override
@@ -177,6 +390,11 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
if (!getUrlBytes().isEmpty()) {
com.google.protobuf.GeneratedMessageV3.writeString(output, 1, url_);
}
+ if (securityLevel_
+ != com.google.cloud.functions.v1.HttpsTrigger.SecurityLevel.SECURITY_LEVEL_UNSPECIFIED
+ .getNumber()) {
+ output.writeEnum(2, securityLevel_);
+ }
unknownFields.writeTo(output);
}
@@ -189,6 +407,11 @@ public int getSerializedSize() {
if (!getUrlBytes().isEmpty()) {
size += com.google.protobuf.GeneratedMessageV3.computeStringSize(1, url_);
}
+ if (securityLevel_
+ != com.google.cloud.functions.v1.HttpsTrigger.SecurityLevel.SECURITY_LEVEL_UNSPECIFIED
+ .getNumber()) {
+ size += com.google.protobuf.CodedOutputStream.computeEnumSize(2, securityLevel_);
+ }
size += unknownFields.getSerializedSize();
memoizedSize = size;
return size;
@@ -206,6 +429,7 @@ public boolean equals(final java.lang.Object obj) {
(com.google.cloud.functions.v1.HttpsTrigger) obj;
if (!getUrl().equals(other.getUrl())) return false;
+ if (securityLevel_ != other.securityLevel_) return false;
if (!unknownFields.equals(other.unknownFields)) return false;
return true;
}
@@ -219,6 +443,8 @@ public int hashCode() {
hash = (19 * hash) + getDescriptor().hashCode();
hash = (37 * hash) + URL_FIELD_NUMBER;
hash = (53 * hash) + getUrl().hashCode();
+ hash = (37 * hash) + SECURITY_LEVEL_FIELD_NUMBER;
+ hash = (53 * hash) + securityLevel_;
hash = (29 * hash) + unknownFields.hashCode();
memoizedHashCode = hash;
return hash;
@@ -366,6 +592,8 @@ public Builder clear() {
super.clear();
url_ = "";
+ securityLevel_ = 0;
+
return this;
}
@@ -394,6 +622,7 @@ public com.google.cloud.functions.v1.HttpsTrigger buildPartial() {
com.google.cloud.functions.v1.HttpsTrigger result =
new com.google.cloud.functions.v1.HttpsTrigger(this);
result.url_ = url_;
+ result.securityLevel_ = securityLevel_;
onBuilt();
return result;
}
@@ -447,6 +676,9 @@ public Builder mergeFrom(com.google.cloud.functions.v1.HttpsTrigger other) {
url_ = other.url_;
onChanged();
}
+ if (other.securityLevel_ != 0) {
+ setSecurityLevelValue(other.getSecurityLevelValue());
+ }
this.mergeUnknownFields(other.unknownFields);
onChanged();
return this;
@@ -582,6 +814,100 @@ public Builder setUrlBytes(com.google.protobuf.ByteString value) {
return this;
}
+ private int securityLevel_ = 0;
+ /**
+ *
+ *
+ *
+ * The security level for the function.
+ *
+ *
+ * .google.cloud.functions.v1.HttpsTrigger.SecurityLevel security_level = 2;
+ *
+ * @return The enum numeric value on the wire for securityLevel.
+ */
+ @java.lang.Override
+ public int getSecurityLevelValue() {
+ return securityLevel_;
+ }
+ /**
+ *
+ *
+ *
+ * The security level for the function.
+ *
+ *
+ * .google.cloud.functions.v1.HttpsTrigger.SecurityLevel security_level = 2;
+ *
+ * @param value The enum numeric value on the wire for securityLevel to set.
+ * @return This builder for chaining.
+ */
+ public Builder setSecurityLevelValue(int value) {
+
+ securityLevel_ = value;
+ onChanged();
+ return this;
+ }
+ /**
+ *
+ *
+ *
+ * The security level for the function.
+ *
+ *
+ * .google.cloud.functions.v1.HttpsTrigger.SecurityLevel security_level = 2;
+ *
+ * @return The securityLevel.
+ */
+ @java.lang.Override
+ public com.google.cloud.functions.v1.HttpsTrigger.SecurityLevel getSecurityLevel() {
+ @SuppressWarnings("deprecation")
+ com.google.cloud.functions.v1.HttpsTrigger.SecurityLevel result =
+ com.google.cloud.functions.v1.HttpsTrigger.SecurityLevel.valueOf(securityLevel_);
+ return result == null
+ ? com.google.cloud.functions.v1.HttpsTrigger.SecurityLevel.UNRECOGNIZED
+ : result;
+ }
+ /**
+ *
+ *
+ *
+ * The security level for the function.
+ *
+ *
+ * .google.cloud.functions.v1.HttpsTrigger.SecurityLevel security_level = 2;
+ *
+ * @param value The securityLevel to set.
+ * @return This builder for chaining.
+ */
+ public Builder setSecurityLevel(
+ com.google.cloud.functions.v1.HttpsTrigger.SecurityLevel value) {
+ if (value == null) {
+ throw new NullPointerException();
+ }
+
+ securityLevel_ = value.getNumber();
+ onChanged();
+ return this;
+ }
+ /**
+ *
+ *
+ *
+ * The security level for the function.
+ *
+ *
+ * .google.cloud.functions.v1.HttpsTrigger.SecurityLevel security_level = 2;
+ *
+ * @return This builder for chaining.
+ */
+ public Builder clearSecurityLevel() {
+
+ securityLevel_ = 0;
+ onChanged();
+ return this;
+ }
+
@java.lang.Override
public final Builder setUnknownFields(final com.google.protobuf.UnknownFieldSet unknownFields) {
return super.setUnknownFields(unknownFields);
diff --git a/proto-google-cloud-functions-v1/src/main/java/com/google/cloud/functions/v1/HttpsTriggerOrBuilder.java b/proto-google-cloud-functions-v1/src/main/java/com/google/cloud/functions/v1/HttpsTriggerOrBuilder.java
index 4c15fb07..6b44c857 100644
--- a/proto-google-cloud-functions-v1/src/main/java/com/google/cloud/functions/v1/HttpsTriggerOrBuilder.java
+++ b/proto-google-cloud-functions-v1/src/main/java/com/google/cloud/functions/v1/HttpsTriggerOrBuilder.java
@@ -47,4 +47,29 @@ public interface HttpsTriggerOrBuilder
* @return The bytes for url.
*/
com.google.protobuf.ByteString getUrlBytes();
+
+ /**
+ *
+ *
+ *
+ * The security level for the function.
+ *
+ *
+ * .google.cloud.functions.v1.HttpsTrigger.SecurityLevel security_level = 2;
+ *
+ * @return The enum numeric value on the wire for securityLevel.
+ */
+ int getSecurityLevelValue();
+ /**
+ *
+ *
+ *
+ * The security level for the function.
+ *
+ *
+ * .google.cloud.functions.v1.HttpsTrigger.SecurityLevel security_level = 2;
+ *
+ * @return The securityLevel.
+ */
+ com.google.cloud.functions.v1.HttpsTrigger.SecurityLevel getSecurityLevel();
}
diff --git a/proto-google-cloud-functions-v1/src/main/proto/google/cloud/functions/v1/functions.proto b/proto-google-cloud-functions-v1/src/main/proto/google/cloud/functions/v1/functions.proto
index 98a6d536..049378ab 100644
--- a/proto-google-cloud-functions-v1/src/main/proto/google/cloud/functions/v1/functions.proto
+++ b/proto-google-cloud-functions-v1/src/main/proto/google/cloud/functions/v1/functions.proto
@@ -375,8 +375,31 @@ message SourceRepository {
// Describes HttpsTrigger, could be used to connect web hooks to function.
message HttpsTrigger {
+ // Available security level settings.
+ //
+ // This controls the methods to enforce security (HTTPS) on a URL.
+ //
+ // If unspecified, SECURE_OPTIONAL will be used.
+ enum SecurityLevel {
+ // Unspecified.
+ SECURITY_LEVEL_UNSPECIFIED = 0;
+
+ // Requests for a URL that match this handler that do not use HTTPS are
+ // automatically redirected to the HTTPS URL with the same path. Query
+ // parameters are reserved for the redirect.
+ SECURE_ALWAYS = 1;
+
+ // Both HTTP and HTTPS requests with URLs that match the handler succeed
+ // without redirects. The application can examine the request to determine
+ // which protocol was used and respond accordingly.
+ SECURE_OPTIONAL = 2;
+ }
+
// Output only. The deployed url for the function.
string url = 1 [(google.api.field_behavior) = OUTPUT_ONLY];
+
+ // The security level for the function.
+ SecurityLevel security_level = 2;
}
// Describes EventTrigger, used to request events be sent from another
From 8bba97250bdae71580eaa0155ada6e9fa9f8e303 Mon Sep 17 00:00:00 2001
From: WhiteSource Renovate
Date: Wed, 22 Sep 2021 17:50:35 +0200
Subject: [PATCH 04/10] build(deps): update dependency
com.google.cloud:google-cloud-shared-config to v1.0.3 (#307)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
[](https://renovatebot.com)
This PR contains the following updates:
| Package | Change | Age | Adoption | Passing | Confidence |
|---|---|---|---|---|---|
| [com.google.cloud:google-cloud-shared-config](https://togithub.com/googleapis/java-shared-config) | `1.0.2` -> `1.0.3` | [](https://docs.renovatebot.com/merge-confidence/) | [](https://docs.renovatebot.com/merge-confidence/) | [](https://docs.renovatebot.com/merge-confidence/) | [](https://docs.renovatebot.com/merge-confidence/) |
---
### Release Notes
googleapis/java-shared-config
### [`v1.0.3`](https://togithub.com/googleapis/java-shared-config/blob/master/CHANGELOG.md#103-httpswwwgithubcomgoogleapisjava-shared-configcomparev102v103-2021-09-21)
[Compare Source](https://togithub.com/googleapis/java-shared-config/compare/v1.0.2...v1.0.3)
---
### Configuration
📅 **Schedule**: At any time (no schedule defined).
🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied.
â™» **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox.
🔕 **Ignore**: Close this PR and you won't be reminded about this update again.
---
- [ ] If you want to rebase/retry this PR, check this box.
---
This PR has been generated by [WhiteSource Renovate](https://renovate.whitesourcesoftware.com). View repository job log [here](https://app.renovatebot.com/dashboard#github/googleapis/java-functions).
---
google-cloud-functions-bom/pom.xml | 2 +-
pom.xml | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/google-cloud-functions-bom/pom.xml b/google-cloud-functions-bom/pom.xml
index fc8dd8b0..61761ed0 100644
--- a/google-cloud-functions-bom/pom.xml
+++ b/google-cloud-functions-bom/pom.xml
@@ -8,7 +8,7 @@
com.google.cloud
google-cloud-shared-config
- 1.0.2
+ 1.0.3
Google Cloud Functions BOM
diff --git a/pom.xml b/pom.xml
index d748839b..74e1e0bd 100644
--- a/pom.xml
+++ b/pom.xml
@@ -14,7 +14,7 @@
com.google.cloud
google-cloud-shared-config
- 1.0.2
+ 1.0.3
From 462439372a9b84976ee16c581f24f1cb994a7925 Mon Sep 17 00:00:00 2001
From: WhiteSource Renovate
Date: Wed, 22 Sep 2021 22:28:27 +0200
Subject: [PATCH 05/10] deps: update dependency
com.google.cloud:google-cloud-shared-dependencies to v2.3.0 (#308)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
[](https://renovatebot.com)
This PR contains the following updates:
| Package | Change | Age | Adoption | Passing | Confidence |
|---|---|---|---|---|---|
| [com.google.cloud:google-cloud-shared-dependencies](https://togithub.com/googleapis/java-shared-dependencies) | `2.2.1` -> `2.3.0` | [](https://docs.renovatebot.com/merge-confidence/) | [](https://docs.renovatebot.com/merge-confidence/) | [](https://docs.renovatebot.com/merge-confidence/) | [](https://docs.renovatebot.com/merge-confidence/) |
---
### Release Notes
googleapis/java-shared-dependencies
### [`v2.3.0`](https://togithub.com/googleapis/java-shared-dependencies/blob/master/CHANGELOG.md#230-httpswwwgithubcomgoogleapisjava-shared-dependenciescompare221v230-2021-09-22)
[Compare Source](https://togithub.com/googleapis/java-shared-dependencies/compare/v2.2.1...v2.3.0)
##### Dependencies
- keep protobuf at 3.17.3 (not the latest 3.18.0) ([#476](https://www.togithub.com/googleapis/java-shared-dependencies/issues/476)) ([e207c81](https://www.github.com/googleapis/java-shared-dependencies/commit/e207c818f220967e3618d7a9d36f2cf26c07892e))
- update gax.version to v2.5.0 ([#479](https://www.togithub.com/googleapis/java-shared-dependencies/issues/479)) ([e22e62a](https://www.github.com/googleapis/java-shared-dependencies/commit/e22e62a3b248023ae94da2a02ec50006377a5157))
- update google.core.version to v2.1.4 ([#473](https://www.togithub.com/googleapis/java-shared-dependencies/issues/473)) ([116f278](https://www.github.com/googleapis/java-shared-dependencies/commit/116f2783dfc18f215905ceaff9f85f331f83472b))
- update google.core.version to v2.1.6 ([#478](https://www.togithub.com/googleapis/java-shared-dependencies/issues/478)) ([9e09728](https://www.github.com/googleapis/java-shared-dependencies/commit/9e0972834764b25e5e194e0e805efc5453120df3))
- update iam.version to v1.1.1 ([#470](https://www.togithub.com/googleapis/java-shared-dependencies/issues/470)) ([3b6e960](https://www.github.com/googleapis/java-shared-dependencies/commit/3b6e96050af8d976a30165481d764d8226143a39))
- update iam.version to v1.1.2 ([#472](https://www.togithub.com/googleapis/java-shared-dependencies/issues/472)) ([85329cc](https://www.github.com/googleapis/java-shared-dependencies/commit/85329cc6c13d16fe2eeeb076959ee16a752c1f9e))
##### [2.2.1](https://www.github.com/googleapis/java-shared-dependencies/compare/2.2.0...v2.2.1) (2021-09-13)
##### Dependencies
- update gax.version to v2.4.1 ([#464](https://www.togithub.com/googleapis/java-shared-dependencies/issues/464)) ([bc7c6d7](https://www.github.com/googleapis/java-shared-dependencies/commit/bc7c6d7ca161ebfa31895c375d65bca29d4c7336))
- update google.core.version to v2.1.3 ([#465](https://www.togithub.com/googleapis/java-shared-dependencies/issues/465)) ([848f608](https://www.github.com/googleapis/java-shared-dependencies/commit/848f608ae850bd2dd80ec56034eb0c9a18f0415b))
---
### Configuration
📅 **Schedule**: At any time (no schedule defined).
🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied.
â™» **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox.
🔕 **Ignore**: Close this PR and you won't be reminded about this update again.
---
- [ ] If you want to rebase/retry this PR, check this box.
---
This PR has been generated by [WhiteSource Renovate](https://renovate.whitesourcesoftware.com). View repository job log [here](https://app.renovatebot.com/dashboard#github/googleapis/java-functions).
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index 74e1e0bd..a5875cc8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -77,7 +77,7 @@
com.google.cloud
google-cloud-shared-dependencies
- 2.2.1
+ 2.3.0
pom
import
From ee6e30591b0691aeb8579ff264a44ebacf06a7a0 Mon Sep 17 00:00:00 2001
From: "gcf-owl-bot[bot]" <78513119+gcf-owl-bot[bot]@users.noreply.github.com>
Date: Thu, 23 Sep 2021 13:32:40 -0700
Subject: [PATCH 06/10] chore(java): remove dependencyDashboardLabel config
from renovate.json (#1220) (#309)
Source-Link: https://github.com/googleapis/synthtool/commit/0752ff727a19a467dffed335d5e59303689cf0d1
Post-Processor: gcr.io/repo-automation-bots/owlbot-java:latest@sha256:52b5557b7155a80e6f1684c2376d5eef0df6d8d5c785551e1ff8cc000603b62a
Co-authored-by: Owl Bot
---
.github/.OwlBot.lock.yaml | 2 +-
renovate.json | 5 +----
2 files changed, 2 insertions(+), 5 deletions(-)
diff --git a/.github/.OwlBot.lock.yaml b/.github/.OwlBot.lock.yaml
index b6721276..9fb406b3 100644
--- a/.github/.OwlBot.lock.yaml
+++ b/.github/.OwlBot.lock.yaml
@@ -1,3 +1,3 @@
docker:
image: gcr.io/repo-automation-bots/owlbot-java:latest
- digest: sha256:8c50e7bab0ae5ad41ee29420b558542637104500f6256b8fe74282b0cf6144db
+ digest: sha256:52b5557b7155a80e6f1684c2376d5eef0df6d8d5c785551e1ff8cc000603b62a
diff --git a/renovate.json b/renovate.json
index e142fd62..5a4be432 100644
--- a/renovate.json
+++ b/renovate.json
@@ -70,8 +70,5 @@
}
],
"semanticCommits": true,
- "dependencyDashboard": true,
- "dependencyDashboardLabels": [
- "type: process"
- ]
+ "dependencyDashboard": true
}
From acef843561df7426821a95c5d6beca918ec19933 Mon Sep 17 00:00:00 2001
From: Jeffrey Rennie
Date: Fri, 24 Sep 2021 11:26:27 -0700
Subject: [PATCH 07/10] chore: relocate owl bot post processor (#306)
chore: relocate owl bot post processor
---
.github/.OwlBot.lock.yaml | 2 +-
.github/.OwlBot.yaml | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/.github/.OwlBot.lock.yaml b/.github/.OwlBot.lock.yaml
index 9fb406b3..afb21e42 100644
--- a/.github/.OwlBot.lock.yaml
+++ b/.github/.OwlBot.lock.yaml
@@ -1,3 +1,3 @@
docker:
- image: gcr.io/repo-automation-bots/owlbot-java:latest
+ image: gcr.io/cloud-devrel-public-resources/owlbot-java:latest
digest: sha256:52b5557b7155a80e6f1684c2376d5eef0df6d8d5c785551e1ff8cc000603b62a
diff --git a/.github/.OwlBot.yaml b/.github/.OwlBot.yaml
index 0da17c74..6053f41e 100644
--- a/.github/.OwlBot.yaml
+++ b/.github/.OwlBot.yaml
@@ -13,7 +13,7 @@
# limitations under the License.
docker:
- image: "gcr.io/repo-automation-bots/owlbot-java:latest"
+ image: "gcr.io/cloud-devrel-public-resources/owlbot-java:latest"
deep-remove-regex:
- "/grpc-google-.*/src"
From 0ee843e9a6971587ec0a1148621508cdb19edd41 Mon Sep 17 00:00:00 2001
From: "gcf-owl-bot[bot]" <78513119+gcf-owl-bot[bot]@users.noreply.github.com>
Date: Mon, 27 Sep 2021 13:55:59 -0400
Subject: [PATCH 08/10] build: add jdk 17 to java units and dependency builds
(#1216) (#311)
* update dependencies.sh to not pass MaxPermSize when jdk 17 is used. MaxPermSize is an unrecognized flag in jdk 17.
Source-Link: https://github.com/googleapis/synthtool/commit/a4be3384ccb92364795d981f2863f6986fcee620
Post-Processor: gcr.io/cloud-devrel-public-resources/owlbot-java:latest@sha256:13b7387edb404234610d30473ac48210ae7fe42a136335ee2b2f8a07c4c7f6a5
Co-authored-by: Owl Bot
---
.github/.OwlBot.lock.yaml | 2 +-
.github/blunderbuss.yml | 2 +-
.github/workflows/ci.yaml | 21 +++++++++++++--------
.kokoro/dependencies.sh | 23 ++++++++++++++++++++++-
README.md | 8 ++++----
5 files changed, 41 insertions(+), 15 deletions(-)
diff --git a/.github/.OwlBot.lock.yaml b/.github/.OwlBot.lock.yaml
index afb21e42..5ff6c87c 100644
--- a/.github/.OwlBot.lock.yaml
+++ b/.github/.OwlBot.lock.yaml
@@ -1,3 +1,3 @@
docker:
image: gcr.io/cloud-devrel-public-resources/owlbot-java:latest
- digest: sha256:52b5557b7155a80e6f1684c2376d5eef0df6d8d5c785551e1ff8cc000603b62a
+ digest: sha256:13b7387edb404234610d30473ac48210ae7fe42a136335ee2b2f8a07c4c7f6a5
diff --git a/.github/blunderbuss.yml b/.github/blunderbuss.yml
index 1a23ea42..2176b054 100644
--- a/.github/blunderbuss.yml
+++ b/.github/blunderbuss.yml
@@ -1,5 +1,5 @@
# Configuration for the Blunderbuss GitHub app. For more info see
-# https://github.com/googleapis/repo-automation-bots/tree/master/packages/blunderbuss
+# https://github.com/googleapis/repo-automation-bots/tree/main/packages/blunderbuss
assign_prs_by:
- labels:
- samples
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index 3becb5c0..2425d723 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -1,7 +1,7 @@
on:
push:
branches:
- - master
+ - main
pull_request:
name: ci
jobs:
@@ -9,14 +9,15 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
- java: [8, 11]
+ java: [8, 11, 17]
steps:
- uses: actions/checkout@v2
- uses: stCarolas/setup-maven@v4
with:
maven-version: 3.8.1
- - uses: actions/setup-java@v1
+ - uses: actions/setup-java@v2
with:
+ distribution: zulu
java-version: ${{matrix.java}}
- run: java -version
- run: .kokoro/build.sh
@@ -29,8 +30,9 @@ jobs:
- uses: stCarolas/setup-maven@v4
with:
maven-version: 3.8.1
- - uses: actions/setup-java@v1
+ - uses: actions/setup-java@v2
with:
+ distribution: zulu
java-version: 8
- run: java -version
- run: .kokoro/build.bat
@@ -40,14 +42,15 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
- java: [8, 11]
+ java: [8, 11, 17]
steps:
- uses: actions/checkout@v2
- uses: stCarolas/setup-maven@v4
with:
maven-version: 3.8.1
- - uses: actions/setup-java@v1
+ - uses: actions/setup-java@v2
with:
+ distribution: zulu
java-version: ${{matrix.java}}
- run: java -version
- run: .kokoro/dependencies.sh
@@ -58,8 +61,9 @@ jobs:
- uses: stCarolas/setup-maven@v4
with:
maven-version: 3.8.1
- - uses: actions/setup-java@v1
+ - uses: actions/setup-java@v2
with:
+ distribution: zulu
java-version: 8
- run: java -version
- run: .kokoro/build.sh
@@ -72,8 +76,9 @@ jobs:
- uses: stCarolas/setup-maven@v4
with:
maven-version: 3.8.1
- - uses: actions/setup-java@v1
+ - uses: actions/setup-java@v2
with:
+ distribution: zulu
java-version: 8
- run: java -version
- run: .kokoro/build.sh
diff --git a/.kokoro/dependencies.sh b/.kokoro/dependencies.sh
index 9030ba8f..9a5105d7 100755
--- a/.kokoro/dependencies.sh
+++ b/.kokoro/dependencies.sh
@@ -28,7 +28,28 @@ source ${scriptDir}/common.sh
java -version
echo $JOB_TYPE
-export MAVEN_OPTS="-Xmx1024m -XX:MaxPermSize=128m"
+function determineMavenOpts() {
+ local javaVersion=$(
+ # filter down to the version line, then pull out the version between quotes,
+ # then trim the version number down to its minimal number (removing any
+ # update or suffix number).
+ java -version 2>&1 | grep "version" \
+ | sed -E 's/^.*"(.*?)".*$/\1/g' \
+ | sed -E 's/^(1\.[0-9]\.0).*$/\1/g'
+ )
+
+ case $javaVersion in
+ "17")
+ # MaxPermSize is no longer supported as of jdk 17
+ echo -n "-Xmx1024m"
+ ;;
+ *)
+ echo -n "-Xmx1024m -XX:MaxPermSize=128m"
+ ;;
+ esac
+}
+
+export MAVEN_OPTS=$(determineMavenOpts)
# this should run maven enforcer
retry_with_backoff 3 10 \
diff --git a/README.md b/README.md
index e336a85a..db67aed9 100644
--- a/README.md
+++ b/README.md
@@ -181,10 +181,10 @@ Java is a registered trademark of Oracle and/or its affiliates.
[developer-console]: https://console.developers.google.com/
[create-project]: https://cloud.google.com/resource-manager/docs/creating-managing-projects
[cloud-sdk]: https://cloud.google.com/sdk/
-[troubleshooting]: https://github.com/googleapis/google-cloud-common/blob/master/troubleshooting/readme.md#troubleshooting
-[contributing]: https://github.com/googleapis/java-functions/blob/master/CONTRIBUTING.md
-[code-of-conduct]: https://github.com/googleapis/java-functions/blob/master/CODE_OF_CONDUCT.md#contributor-code-of-conduct
-[license]: https://github.com/googleapis/java-functions/blob/master/LICENSE
+[troubleshooting]: https://github.com/googleapis/google-cloud-common/blob/main/troubleshooting/readme.md#troubleshooting
+[contributing]: https://github.com/googleapis/java-functions/blob/main/CONTRIBUTING.md
+[code-of-conduct]: https://github.com/googleapis/java-functions/blob/main/CODE_OF_CONDUCT.md#contributor-code-of-conduct
+[license]: https://github.com/googleapis/java-functions/blob/main/LICENSE
[enable-billing]: https://cloud.google.com/apis/docs/getting-started#enabling_billing
[enable-api]: https://console.cloud.google.com/flows/enableapi?apiid=cloudfunctions.googleapis.com
[libraries-bom]: https://github.com/GoogleCloudPlatform/cloud-opensource-java/wiki/The-Google-Cloud-Platform-Libraries-BOM
From 9ee1e876ae3bf8bd7a7218efb2a962a45e4aeb94 Mon Sep 17 00:00:00 2001
From: Neenu Shaji
Date: Mon, 27 Sep 2021 15:26:49 -0400
Subject: [PATCH 09/10] chore: change branch master to main in
sync-repo-settings.yaml (#313)
---
.github/sync-repo-settings.yaml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/.github/sync-repo-settings.yaml b/.github/sync-repo-settings.yaml
index 32e0ea5a..6f09d695 100644
--- a/.github/sync-repo-settings.yaml
+++ b/.github/sync-repo-settings.yaml
@@ -2,7 +2,7 @@ rebaseMergeAllowed: false
squashMergeAllowed: true
mergeCommitAllowed: false
branchProtectionRules:
- - pattern: master
+ - pattern: main
isAdminEnforced: true
requiredApprovingReviewCount: 1
requiresCodeOwnerReviews: true
From b2ad840cfbd1064d60bb72d896c6f66f7f6b3dfd Mon Sep 17 00:00:00 2001
From: "release-please[bot]"
<55107282+release-please[bot]@users.noreply.github.com>
Date: Mon, 27 Sep 2021 21:04:25 +0000
Subject: [PATCH 10/10] chore: release 2.2.0 (#312)
:robot: I have created a release \*beep\* \*boop\*
---
## [2.2.0](https://www.github.com/googleapis/java-functions/compare/v2.1.1...v2.2.0) (2021-09-27)
### Features
* add SecurityLevel option on HttpsTrigger ([#304](https://www.github.com/googleapis/java-functions/issues/304)) ([7141d40](https://www.github.com/googleapis/java-functions/commit/7141d405a8b0a6988dc751a4706f37f3fbe75119))
### Dependencies
* update dependency com.google.cloud:google-cloud-shared-dependencies to v2.3.0 ([#308](https://www.github.com/googleapis/java-functions/issues/308)) ([4624393](https://www.github.com/googleapis/java-functions/commit/462439372a9b84976ee16c581f24f1cb994a7925))
---
This PR was generated with [Release Please](https://github.com/googleapis/release-please). See [documentation](https://github.com/googleapis/release-please#release-please).
---
CHANGELOG.md | 12 ++++++++++++
google-cloud-functions-bom/pom.xml | 8 ++++----
google-cloud-functions/pom.xml | 4 ++--
grpc-google-cloud-functions-v1/pom.xml | 4 ++--
pom.xml | 8 ++++----
proto-google-cloud-functions-v1/pom.xml | 4 ++--
versions.txt | 6 +++---
7 files changed, 29 insertions(+), 17 deletions(-)
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0bc1f297..079dee64 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,17 @@
# Changelog
+## [2.2.0](https://www.github.com/googleapis/java-functions/compare/v2.1.1...v2.2.0) (2021-09-27)
+
+
+### Features
+
+* add SecurityLevel option on HttpsTrigger ([#304](https://www.github.com/googleapis/java-functions/issues/304)) ([7141d40](https://www.github.com/googleapis/java-functions/commit/7141d405a8b0a6988dc751a4706f37f3fbe75119))
+
+
+### Dependencies
+
+* update dependency com.google.cloud:google-cloud-shared-dependencies to v2.3.0 ([#308](https://www.github.com/googleapis/java-functions/issues/308)) ([4624393](https://www.github.com/googleapis/java-functions/commit/462439372a9b84976ee16c581f24f1cb994a7925))
+
### [2.1.1](https://www.github.com/googleapis/java-functions/compare/v2.1.0...v2.1.1) (2021-09-14)
diff --git a/google-cloud-functions-bom/pom.xml b/google-cloud-functions-bom/pom.xml
index 61761ed0..4f3b67d8 100644
--- a/google-cloud-functions-bom/pom.xml
+++ b/google-cloud-functions-bom/pom.xml
@@ -3,7 +3,7 @@
4.0.0
com.google.cloud
google-cloud-functions-bom
- 2.1.2-SNAPSHOT
+ 2.2.0
pom
com.google.cloud
@@ -56,17 +56,17 @@
com.google.cloud
google-cloud-functions
- 2.1.2-SNAPSHOT
+ 2.2.0
com.google.api.grpc
grpc-google-cloud-functions-v1
- 2.1.2-SNAPSHOT
+ 2.2.0
com.google.api.grpc
proto-google-cloud-functions-v1
- 2.1.2-SNAPSHOT
+ 2.2.0