Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

secure workflow #16

Open
wants to merge 9 commits into
base: main
Choose a base branch
from
5 changes: 4 additions & 1 deletion .github/workflows/hermetic_library_generation.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,9 @@ name: Hermetic library generation upon generation config change through pull req
on:
pull_request:

env:
HEAD_REF: ${{ github.head_ref }}

jobs:
library_generation:
# skip pull requests come from a forked repository
Expand All @@ -35,6 +38,6 @@ jobs:
[ -z "$(git config user.name)" ] && git config --global user.name "cloud-java-bot"
bash .github/scripts/hermetic_library_generation.sh \
--target_branch ${{ github.base_ref }} \
--current_branch ${{ github.head_ref }}
--current_branch $HEAD_REF
env:
GH_TOKEN: ${{ secrets.CLOUD_JAVA_BOT_TOKEN }}
2 changes: 1 addition & 1 deletion .github/workflows/unmanaged_dependency_check.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,6 @@ jobs:
# repository
.kokoro/build.sh
- name: Unmanaged dependency check
uses: googleapis/sdk-platform-java/java-shared-dependencies/unmanaged-dependency-check@google-cloud-shared-dependencies/v3.32.0
uses: googleapis/sdk-platform-java/java-shared-dependencies/unmanaged-dependency-check@google-cloud-shared-dependencies/v3.33.0
with:
bom-path: google-cloud-logging-bom/pom.xml
2 changes: 1 addition & 1 deletion .kokoro/presubmit/graalvm-native-17.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
# Configure the docker image for kokoro-trampoline.
env_vars: {
key: "TRAMPOLINE_IMAGE"
value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_b:3.32.0"
value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_b:3.33.0"
}

env_vars: {
Expand Down
2 changes: 1 addition & 1 deletion .kokoro/presubmit/graalvm-native.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
# Configure the docker image for kokoro-trampoline.
env_vars: {
key: "TRAMPOLINE_IMAGE"
value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_a:3.32.0"
value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_a:3.33.0"
}

env_vars: {
Expand Down
17 changes: 17 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,22 @@
# Changelog

## [3.20.0](https://github.com/googleapis/java-logging/compare/v3.19.0...v3.20.0) (2024-08-02)


### Features

* Enable hermetic library generation ([#1620](https://github.com/googleapis/java-logging/issues/1620)) ([034b9c4](https://github.com/googleapis/java-logging/commit/034b9c42ac8ba12f20dbde9e90ae8e59ea4c5748))


### Dependencies

* Update dependency com.google.cloud:sdk-platform-java-config to v3.33.0 ([#1664](https://github.com/googleapis/java-logging/issues/1664)) ([cb6de76](https://github.com/googleapis/java-logging/commit/cb6de767ba726a1178b4ebd0b481a4fc2454b910))


### Documentation

* Documentation update for OpenTelemetry and tracing ([#1657](https://github.com/googleapis/java-logging/issues/1657)) ([e3c6670](https://github.com/googleapis/java-logging/commit/e3c667094170ac7d404addc797facbe997ca51d3))

## [3.19.0](https://github.com/googleapis/java-logging/compare/v3.18.0...v3.19.0) (2024-06-26)


Expand Down
6 changes: 3 additions & 3 deletions generation_config.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
gapic_generator_version: 2.42.0
googleapis_commitish: 6f289d775912966eb0cf04bda91e5e355c998d30
libraries_bom_version: 26.38.0
gapic_generator_version: 2.43.0
googleapis_commitish: c37b7f00ae5b9ce0d33ae28473d993cdaa5550cb
libraries_bom_version: 26.43.0
libraries:
- api_shortname: logging
name_pretty: Cloud Logging
Expand Down
10 changes: 5 additions & 5 deletions google-cloud-logging-bom/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,12 @@
<modelVersion>4.0.0</modelVersion>
<groupId>com.google.cloud</groupId>
<artifactId>google-cloud-logging-bom</artifactId>
<version>3.19.0</version><!-- {x-version-update:google-cloud-logging:current} -->
<version>3.20.0</version><!-- {x-version-update:google-cloud-logging:current} -->
<packaging>pom</packaging>
<parent>
<groupId>com.google.cloud</groupId>
<artifactId>google-cloud-shared-config</artifactId>
<version>1.8.0</version>
<version>1.9.1</version>
</parent>

<name>Google Cloud logging BOM</name>
Expand Down Expand Up @@ -53,17 +53,17 @@
<dependency>
<groupId>com.google.cloud</groupId>
<artifactId>google-cloud-logging</artifactId>
<version>3.19.0</version><!-- {x-version-update:google-cloud-logging:current} -->
<version>3.20.0</version><!-- {x-version-update:google-cloud-logging:current} -->
</dependency>
<dependency>
<groupId>com.google.api.grpc</groupId>
<artifactId>grpc-google-cloud-logging-v2</artifactId>
<version>0.108.0</version><!-- {x-version-update:grpc-google-cloud-logging-v2:current} -->
<version>0.109.0</version><!-- {x-version-update:grpc-google-cloud-logging-v2:current} -->
</dependency>
<dependency>
<groupId>com.google.api.grpc</groupId>
<artifactId>proto-google-cloud-logging-v2</artifactId>
<version>0.108.0</version><!-- {x-version-update:proto-google-cloud-logging-v2:current} -->
<version>0.109.0</version><!-- {x-version-update:proto-google-cloud-logging-v2:current} -->
</dependency>
</dependencies>
</dependencyManagement>
Expand Down
4 changes: 2 additions & 2 deletions google-cloud-logging/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,15 @@
<modelVersion>4.0.0</modelVersion>
<groupId>com.google.cloud</groupId>
<artifactId>google-cloud-logging</artifactId>
<version>3.19.0</version><!-- {x-version-update:google-cloud-logging:current} -->
<version>3.20.0</version><!-- {x-version-update:google-cloud-logging:current} -->
<packaging>jar</packaging>
<name>Google Cloud Logging</name>
<url>https://github.com/googleapis/java-logging</url>
<description>Java idiomatic client for Cloud Logging</description>
<parent>
<groupId>com.google.cloud</groupId>
<artifactId>google-cloud-logging-parent</artifactId>
<version>3.19.0</version><!-- {x-version-update:google-cloud-logging:current} -->
<version>3.20.0</version><!-- {x-version-update:google-cloud-logging:current} -->
</parent>
<properties>
<site.installationModule>google-cloud-logging</site.installationModule>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ public final class Instrumentation {
// See
// https://github.com/googleapis/release-please/blob/main/docs/customizing.md#updating-arbitrary-files
// {x-version-update-start:google-cloud-logging:current}
public static final String DEFAULT_INSTRUMENTATION_VERSION = "3.19.0";
public static final String DEFAULT_INSTRUMENTATION_VERSION = "3.20.0";
// {x-version-update-end}
public static final String INSTRUMENTATION_LOG_NAME = "diagnostic-log";
public static final int MAX_DIAGNOSTIC_VALUE_LENGTH = 14;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@

import com.google.api.core.ApiFunction;
import com.google.api.core.ApiFuture;
import com.google.api.core.ObsoleteApi;
import com.google.api.gax.core.GaxProperties;
import com.google.api.gax.core.GoogleCredentialsProvider;
import com.google.api.gax.core.InstantiatingExecutorProvider;
Expand Down Expand Up @@ -690,6 +691,7 @@ public static InstantiatingExecutorProvider.Builder defaultExecutorProviderBuild
}

/** Returns the default service endpoint. */
@ObsoleteApi("Use getEndpoint() instead")
public static String getDefaultEndpoint() {
return "logging.googleapis.com:443";
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@
import com.google.api.MonitoredResourceDescriptor;
import com.google.api.core.ApiFunction;
import com.google.api.core.ApiFuture;
import com.google.api.core.ObsoleteApi;
import com.google.api.gax.batching.BatchingSettings;
import com.google.api.gax.batching.FlowControlSettings;
import com.google.api.gax.batching.FlowController;
Expand Down Expand Up @@ -449,6 +450,7 @@ public static InstantiatingExecutorProvider.Builder defaultExecutorProviderBuild
}

/** Returns the default service endpoint. */
@ObsoleteApi("Use getEndpoint() instead")
public static String getDefaultEndpoint() {
return "logging.googleapis.com:443";
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@

import com.google.api.core.ApiFunction;
import com.google.api.core.ApiFuture;
import com.google.api.core.ObsoleteApi;
import com.google.api.gax.core.GaxProperties;
import com.google.api.gax.core.GoogleCredentialsProvider;
import com.google.api.gax.core.InstantiatingExecutorProvider;
Expand Down Expand Up @@ -217,6 +218,7 @@ public static InstantiatingExecutorProvider.Builder defaultExecutorProviderBuild
}

/** Returns the default service endpoint. */
@ObsoleteApi("Use getEndpoint() instead")
public static String getDefaultEndpoint() {
return "logging.googleapis.com:443";
}
Expand Down
4 changes: 2 additions & 2 deletions grpc-google-cloud-logging-v2/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,13 @@
<modelVersion>4.0.0</modelVersion>
<groupId>com.google.api.grpc</groupId>
<artifactId>grpc-google-cloud-logging-v2</artifactId>
<version>0.108.0</version><!-- {x-version-update:grpc-google-cloud-logging-v2:current} -->
<version>0.109.0</version><!-- {x-version-update:grpc-google-cloud-logging-v2:current} -->
<name>grpc-google-cloud-logging-v2</name>
<description>GRPC library for grpc-google-cloud-logging-v2</description>
<parent>
<groupId>com.google.cloud</groupId>
<artifactId>google-cloud-logging-parent</artifactId>
<version>3.19.0</version><!-- {x-version-update:google-cloud-logging:current} -->
<version>3.20.0</version><!-- {x-version-update:google-cloud-logging:current} -->
</parent>
<dependencies>
<dependency>
Expand Down
12 changes: 6 additions & 6 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<groupId>com.google.cloud</groupId>
<artifactId>google-cloud-logging-parent</artifactId>
<packaging>pom</packaging>
<version>3.19.0</version><!-- {x-version-update:google-cloud-logging:current} -->
<version>3.20.0</version><!-- {x-version-update:google-cloud-logging:current} -->
<name>Google Cloud Logging Parent</name>
<url>https://github.com/googleapis/java-logging</url>
<description>
Expand All @@ -14,7 +14,7 @@
<parent>
<groupId>com.google.cloud</groupId>
<artifactId>sdk-platform-java-config</artifactId>
<version>3.32.0</version>
<version>3.33.0</version>
</parent>

<developers>
Expand Down Expand Up @@ -80,17 +80,17 @@
<dependency>
<groupId>com.google.api.grpc</groupId>
<artifactId>proto-google-cloud-logging-v2</artifactId>
<version>0.108.0</version><!-- {x-version-update:proto-google-cloud-logging-v2:current} -->
<version>0.109.0</version><!-- {x-version-update:proto-google-cloud-logging-v2:current} -->
</dependency>
<dependency>
<groupId>com.google.api.grpc</groupId>
<artifactId>grpc-google-cloud-logging-v2</artifactId>
<version>0.108.0</version><!-- {x-version-update:grpc-google-cloud-logging-v2:current} -->
<version>0.109.0</version><!-- {x-version-update:grpc-google-cloud-logging-v2:current} -->
</dependency>
<dependency>
<groupId>com.google.cloud</groupId>
<artifactId>google-cloud-logging</artifactId>
<version>3.19.0</version><!-- {x-version-update:google-cloud-logging:current} -->
<version>3.20.0</version><!-- {x-version-update:google-cloud-logging:current} -->
</dependency>

<dependency>
Expand Down Expand Up @@ -213,7 +213,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-project-info-reports-plugin</artifactId>
<version>3.5.0</version>
<version>3.6.2</version>
<reportSets>
<reportSet>
<reports>
Expand Down
4 changes: 2 additions & 2 deletions proto-google-cloud-logging-v2/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,13 @@
<modelVersion>4.0.0</modelVersion>
<groupId>com.google.api.grpc</groupId>
<artifactId>proto-google-cloud-logging-v2</artifactId>
<version>0.108.0</version><!-- {x-version-update:proto-google-cloud-logging-v2:current} -->
<version>0.109.0</version><!-- {x-version-update:proto-google-cloud-logging-v2:current} -->
<name>proto-google-cloud-logging-v2</name>
<description>PROTO library for proto-google-cloud-logging-v2</description>
<parent>
<groupId>com.google.cloud</groupId>
<artifactId>google-cloud-logging-parent</artifactId>
<version>3.19.0</version><!-- {x-version-update:google-cloud-logging:current} -->
<version>3.20.0</version><!-- {x-version-update:google-cloud-logging:current} -->
</parent>
<dependencies>
<dependency>
Expand Down
4 changes: 2 additions & 2 deletions renovate.json
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
"customManagers": [
{
"customType": "regex",
"fileMatch": [
"fileMatch": [
"^.kokoro/presubmit/graalvm-native.*.cfg$"
],
"matchStrings": ["value: \"gcr.io/cloud-devrel-public-resources/graalvm.*:(?<currentValue>.*?)\""],
Expand All @@ -30,7 +30,7 @@
{
"customType": "regex",
"fileMatch": [
"^.github/workflows/unmanaged_dependency_check.yaml$"
"^.github/workflows/unmanaged_dependency_check.yaml$"
],
"matchStrings": ["uses: googleapis/sdk-platform-java/java-shared-dependencies/unmanaged-dependency-check@google-cloud-shared-dependencies/v(?<currentValue>.+?)\\n"],
"depNameTemplate": "com.google.cloud:sdk-platform-java-config",
Expand Down
2 changes: 1 addition & 1 deletion samples/native-image-sample/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,7 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin
</artifactId> <!-- Must use older version of surefire plugin for native-image testing. -->
<version>3.2.5</version>
<version>3.3.1</version>
<configuration>
<includes>
<include>**/IT*</include>
Expand Down
2 changes: 1 addition & 1 deletion samples/snapshot/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
<dependency>
<groupId>com.google.cloud</groupId>
<artifactId>google-cloud-logging</artifactId>
<version>3.19.0</version>
<version>3.20.0</version>
</dependency>
<!-- {x-version-update-end} -->
<dependency>
Expand Down
6 changes: 3 additions & 3 deletions versions.txt
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Format:
# module:released-version:current-version

google-cloud-logging:3.19.0:3.19.0
grpc-google-cloud-logging-v2:0.108.0:0.108.0
proto-google-cloud-logging-v2:0.108.0:0.108.0
google-cloud-logging:3.20.0:3.20.0
grpc-google-cloud-logging-v2:0.109.0:0.109.0
proto-google-cloud-logging-v2:0.109.0:0.109.0
Loading