Merge branch 'main' into update-changelog

Author: ohmayr

.generator/Dockerfile

@@ -138,38 +138,6 @@ RUN apt-get update && \
     && apt-get clean && \
     rm -rf /var/lib/apt/lists/*
 
-# Create the group and user, but only if they don't already exist.
-# NOTE: A user needs to be configured by passing down the UID/GID with the 
-# docker build command to allow the user running the librarian CLI to have
-# the permissions within the /app and /bazel_cache directories in the following way:
-# DOCKER_BUILDKIT=1 docker build -f .generator/Dockerfile  --build-arg UID=$(id -u) --build-arg GID=$(id -g) -t python-librarian-generator:latest .
-ARG UID=1000
-ARG GID=1000
-
-RUN if ! getent group $GID > /dev/null; then \
-        groupadd -g $GID myuser; \
-    fi && \
-    if ! getent passwd $UID > /dev/null; then \
-        useradd -u $UID -g $GID -ms /bin/bash myuser; \
-    fi
-
-# 2025/08/05 08:27:44 could not create directory /.cache/bazelisk: mkdir /.cache: permission denied
-# Traceback (most recent call last):
-#   File "/app/./cli.py", line 147, in _build_bazel_target
-#     subprocess.run(
-#   File "/usr/local/lib/python3.9/subprocess.py", line 528, in run
-#     raise CalledProcessError(retcode, process.args,
-# subprocess.CalledProcessError: Command '['bazelisk', '--output_base=/bazel_cache/_bazel_ubuntu/output_base', 'build', '--disk_cache=/bazel_cache/_bazel_ubuntu/cache/repos', '--incompatible_strict_action_env', '//google/cloud/language/v1beta2:language-v1beta2-py']' returned non-zero exit status 1
-# We'll point both to the /bazel_cache directory which will be mounted as a volume.
-ENV BAZELISK_HOME="/bazel_cache/bazelisk"
-ENV BAZEL_HOME="/bazel_cache/bazel"
-RUN mkdir -p ${BAZEL_HOME}/_bazel_ubuntu/cache/repos \
-             ${BAZEL_HOME}/_bazel_ubuntu/output_base \
-             ${BAZELISK_HOME} && \
-    chown -R $UID:$GID ${BAZEL_HOME} ${BAZELISK_HOME}
-
-USER $UID
-
 # Copy all Python interpreters, their pip executables, and their standard libraries from the builder.
 COPY --from=builder /usr/local/bin/python3.9 /usr/local/bin/
 COPY --from=builder /usr/local/lib/python3.9 /usr/local/lib/python3.9
@@ -190,7 +158,8 @@ COPY --from=builder /usr/local/lib/python3.13 /usr/local/lib/python3.13
 COPY --from=builder /usr/local/bin/bazelisk /usr/local/bin/
 
 # Copy bazel cache from the builder.
-COPY --from=builder --chown=$UID:$GID /bazel_cache /bazel_cache
+COPY --from=builder /bazel_cache /bazel_cache
+RUN chmod -R 777 /bazel_cache
 
 # Set the working directory in the container.
 WORKDIR /app
@@ -207,7 +176,7 @@ bazel_env/bin/python3.9 -m pip install /tmp/synthtool nox && \
 rm -rf /tmp/synthtool
 
 # Copy the CLI script into the container.
-COPY --chown=$UID:$GID .generator/cli.py .
+COPY .generator/cli.py .
 RUN chmod a+rx ./cli.py
 
 ENTRYPOINT ["python3.9", "./cli.py"]

.librarian/state.yaml

@@ -1,4 +1,4 @@
-image: python-librarian-generator:latest
+image: us-central1-docker.pkg.dev/cloud-sdk-librarian-prod/images-dev/python-librarian-generator:latest
 libraries:
 - id: google-cloud-language
   version: 2.17.2

cloudbuild-exitgate.yaml

@@ -0,0 +1,25 @@
+# Copyright 2025 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
+#
+#      http://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.
+
+# TODO(https://github.com/googleapis/google-cloud-python/issues/14142):
+# Reduce this timeout by moving the installation of Python runtimes to a separate base image
+timeout: 7200s  # 2 hours for the first uncached run, can be lowered later.
+steps:
+  - name: 'gcr.io/cloud-builders/docker'
+    args: ['build','-f', '.generator/Dockerfile', '-t', 'us-central1-docker.pkg.dev/cloud-sdk-librarian-prod/images-dev/python-librarian-generator', '.']
+images:
+  - 'us-central1-docker.pkg.dev/cloud-sdk-librarian-prod/images-dev/python-librarian-generator'
+options:
+  logging: CLOUD_LOGGING_ONLY
+  machineType: E2_HIGHCPU_32

cloudbuild.yaml renamed to cloudbuild-test.yaml

@@ -24,7 +24,7 @@ steps:
       # Specifies the build context directory
       - '--context=.'
       # The final destination for the image
-      - '--destination=us-central1-docker.pkg.dev/cloud-sdk-librarian-prod/images-dev/python-librarian-generator:latest'
+      - '--destination=gcr.io/$PROJECT_ID/python-librarian-generator:latest'
       # Enables Kaniko's remote registry caching
       - '--cache=true'
       # (Optional but recommended) Sets a time-to-live for cache layers
@@ -33,5 +33,5 @@ steps:
 # The 'images' section is no longer needed because Kaniko pushes the image itself.
 
 options:
-  logging: CLOUD_LOGGING_ONLY
+  default_logs_bucket_behavior: REGIONAL_USER_OWNED_BUCKET
   machineType: E2_HIGHCPU_32

packages/google-analytics-admin/google/analytics/admin/__init__.py

@@ -67,8 +67,6 @@
     CreateBigQueryLinkRequest,
     CreateCalculatedMetricRequest,
     CreateChannelGroupRequest,
-    CreateConnectedSiteTagRequest,
-    CreateConnectedSiteTagResponse,
     CreateConversionEventRequest,
     CreateCustomDimensionRequest,
     CreateCustomMetricRequest,
@@ -96,7 +94,6 @@
     DeleteBigQueryLinkRequest,
     DeleteCalculatedMetricRequest,
     DeleteChannelGroupRequest,
-    DeleteConnectedSiteTagRequest,
     DeleteConversionEventRequest,
     DeleteDataStreamRequest,
     DeleteDisplayVideo360AdvertiserLinkProposalRequest,
@@ -114,10 +111,6 @@
     DeleteSearchAds360LinkRequest,
     DeleteSKAdNetworkConversionValueSchemaRequest,
     DeleteSubpropertyEventFilterRequest,
-    FetchAutomatedGa4ConfigurationOptOutRequest,
-    FetchAutomatedGa4ConfigurationOptOutResponse,
-    FetchConnectedGa4PropertyRequest,
-    FetchConnectedGa4PropertyResponse,
     GetAccessBindingRequest,
     GetAccountRequest,
     GetAdSenseLinkRequest,
@@ -145,6 +138,7 @@
     GetMeasurementProtocolSecretRequest,
     GetPropertyRequest,
     GetReportingDataAnnotationRequest,
+    GetReportingIdentitySettingsRequest,
     GetRollupPropertySourceLinkRequest,
     GetSearchAds360LinkRequest,
     GetSKAdNetworkConversionValueSchemaRequest,
@@ -166,8 +160,6 @@
     ListCalculatedMetricsResponse,
     ListChannelGroupsRequest,
     ListChannelGroupsResponse,
-    ListConnectedSiteTagsRequest,
-    ListConnectedSiteTagsResponse,
     ListConversionEventsRequest,
     ListConversionEventsResponse,
     ListCustomDimensionsRequest,
@@ -217,8 +209,6 @@
     RunAccessReportResponse,
     SearchChangeHistoryEventsRequest,
     SearchChangeHistoryEventsResponse,
-    SetAutomatedGa4ConfigurationOptOutRequest,
-    SetAutomatedGa4ConfigurationOptOutResponse,
     SubmitUserDeletionRequest,
     SubmitUserDeletionResponse,
     UpdateAccessBindingRequest,
@@ -295,7 +285,6 @@
     ChangeHistoryEvent,
     ChangeHistoryResourceType,
     CoarseValue,
-    ConnectedSiteTag,
     ConversionEvent,
     ConversionValues,
     CustomDimension,
@@ -325,6 +314,7 @@
     PropertySummary,
     PropertyType,
     ReportingDataAnnotation,
+    ReportingIdentitySettings,
     RollupPropertySourceLink,
     SearchAds360Link,
     ServiceLevel,
@@ -382,8 +372,6 @@
     "CreateBigQueryLinkRequest",
     "CreateCalculatedMetricRequest",
     "CreateChannelGroupRequest",
-    "CreateConnectedSiteTagRequest",
-    "CreateConnectedSiteTagResponse",
     "CreateConversionEventRequest",
     "CreateCustomDimensionRequest",
     "CreateCustomMetricRequest",
@@ -411,7 +399,6 @@
     "DeleteBigQueryLinkRequest",
     "DeleteCalculatedMetricRequest",
     "DeleteChannelGroupRequest",
-    "DeleteConnectedSiteTagRequest",
     "DeleteConversionEventRequest",
     "DeleteDataStreamRequest",
     "DeleteDisplayVideo360AdvertiserLinkProposalRequest",
@@ -429,10 +416,6 @@
     "DeleteSearchAds360LinkRequest",
     "DeleteSKAdNetworkConversionValueSchemaRequest",
     "DeleteSubpropertyEventFilterRequest",
-    "FetchAutomatedGa4ConfigurationOptOutRequest",
-    "FetchAutomatedGa4ConfigurationOptOutResponse",
-    "FetchConnectedGa4PropertyRequest",
-    "FetchConnectedGa4PropertyResponse",
     "GetAccessBindingRequest",
     "GetAccountRequest",
     "GetAdSenseLinkRequest",
@@ -460,6 +443,7 @@
     "GetMeasurementProtocolSecretRequest",
     "GetPropertyRequest",
     "GetReportingDataAnnotationRequest",
+    "GetReportingIdentitySettingsRequest",
     "GetRollupPropertySourceLinkRequest",
     "GetSearchAds360LinkRequest",
     "GetSKAdNetworkConversionValueSchemaRequest",
@@ -481,8 +465,6 @@
     "ListCalculatedMetricsResponse",
     "ListChannelGroupsRequest",
     "ListChannelGroupsResponse",
-    "ListConnectedSiteTagsRequest",
-    "ListConnectedSiteTagsResponse",
     "ListConversionEventsRequest",
     "ListConversionEventsResponse",
     "ListCustomDimensionsRequest",
@@ -532,8 +514,6 @@
     "RunAccessReportResponse",
     "SearchChangeHistoryEventsRequest",
     "SearchChangeHistoryEventsResponse",
-    "SetAutomatedGa4ConfigurationOptOutRequest",
-    "SetAutomatedGa4ConfigurationOptOutResponse",
     "SubmitUserDeletionRequest",
     "SubmitUserDeletionResponse",
     "UpdateAccessBindingRequest",
@@ -596,7 +576,6 @@
     "CalculatedMetric",
     "ChangeHistoryChange",
     "ChangeHistoryEvent",
-    "ConnectedSiteTag",
     "ConversionEvent",
     "ConversionValues",
     "CustomDimension",
@@ -620,6 +599,7 @@
     "Property",
     "PropertySummary",
     "ReportingDataAnnotation",
+    "ReportingIdentitySettings",
     "RollupPropertySourceLink",
     "SearchAds360Link",
     "SKAdNetworkConversionValueSchema",

packages/google-analytics-admin/google/analytics/admin/gapic_version.py

@@ -13,4 +13,4 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
-__version__ = "0.24.1"  # {x-release-please-version}
+__version__ = "0.0.0"  # {x-release-please-version}

packages/google-analytics-admin/google/analytics/admin_v1alpha/__init__.py

@@ -65,8 +65,6 @@
     CreateBigQueryLinkRequest,
     CreateCalculatedMetricRequest,
     CreateChannelGroupRequest,
-    CreateConnectedSiteTagRequest,
-    CreateConnectedSiteTagResponse,
     CreateConversionEventRequest,
     CreateCustomDimensionRequest,
     CreateCustomMetricRequest,
@@ -94,7 +92,6 @@
     DeleteBigQueryLinkRequest,
     DeleteCalculatedMetricRequest,
     DeleteChannelGroupRequest,
-    DeleteConnectedSiteTagRequest,
     DeleteConversionEventRequest,
     DeleteDataStreamRequest,
     DeleteDisplayVideo360AdvertiserLinkProposalRequest,
@@ -112,10 +109,6 @@
     DeleteSearchAds360LinkRequest,
     DeleteSKAdNetworkConversionValueSchemaRequest,
     DeleteSubpropertyEventFilterRequest,
-    FetchAutomatedGa4ConfigurationOptOutRequest,
-    FetchAutomatedGa4ConfigurationOptOutResponse,
-    FetchConnectedGa4PropertyRequest,
-    FetchConnectedGa4PropertyResponse,
     GetAccessBindingRequest,
     GetAccountRequest,
     GetAdSenseLinkRequest,
@@ -143,6 +136,7 @@
     GetMeasurementProtocolSecretRequest,
     GetPropertyRequest,
     GetReportingDataAnnotationRequest,
+    GetReportingIdentitySettingsRequest,
     GetRollupPropertySourceLinkRequest,
     GetSearchAds360LinkRequest,
     GetSKAdNetworkConversionValueSchemaRequest,
@@ -164,8 +158,6 @@
     ListCalculatedMetricsResponse,
     ListChannelGroupsRequest,
     ListChannelGroupsResponse,
-    ListConnectedSiteTagsRequest,
-    ListConnectedSiteTagsResponse,
     ListConversionEventsRequest,
     ListConversionEventsResponse,
     ListCustomDimensionsRequest,
@@ -215,8 +207,6 @@
     RunAccessReportResponse,
     SearchChangeHistoryEventsRequest,
     SearchChangeHistoryEventsResponse,
-    SetAutomatedGa4ConfigurationOptOutRequest,
-    SetAutomatedGa4ConfigurationOptOutResponse,
     SubmitUserDeletionRequest,
     SubmitUserDeletionResponse,
     UpdateAccessBindingRequest,
@@ -293,7 +283,6 @@
     ChangeHistoryEvent,
     ChangeHistoryResourceType,
     CoarseValue,
-    ConnectedSiteTag,
     ConversionEvent,
     ConversionValues,
     CustomDimension,
@@ -323,6 +312,7 @@
     PropertySummary,
     PropertyType,
     ReportingDataAnnotation,
+    ReportingIdentitySettings,
     RollupPropertySourceLink,
     SearchAds360Link,
     ServiceLevel,
@@ -400,7 +390,6 @@
     "ChannelGroupFilterExpression",
     "ChannelGroupFilterExpressionList",
     "CoarseValue",
-    "ConnectedSiteTag",
     "ConversionEvent",
     "ConversionValues",
     "CreateAccessBindingRequest",
@@ -409,8 +398,6 @@
     "CreateBigQueryLinkRequest",
     "CreateCalculatedMetricRequest",
     "CreateChannelGroupRequest",
-    "CreateConnectedSiteTagRequest",
-    "CreateConnectedSiteTagResponse",
     "CreateConversionEventRequest",
     "CreateCustomDimensionRequest",
     "CreateCustomMetricRequest",
@@ -444,7 +431,6 @@
     "DeleteBigQueryLinkRequest",
     "DeleteCalculatedMetricRequest",
     "DeleteChannelGroupRequest",
-    "DeleteConnectedSiteTagRequest",
     "DeleteConversionEventRequest",
     "DeleteDataStreamRequest",
     "DeleteDisplayVideo360AdvertiserLinkProposalRequest",
@@ -472,10 +458,6 @@
     "ExpandedDataSetFilter",
     "ExpandedDataSetFilterExpression",
     "ExpandedDataSetFilterExpressionList",
-    "FetchAutomatedGa4ConfigurationOptOutRequest",
-    "FetchAutomatedGa4ConfigurationOptOutResponse",
-    "FetchConnectedGa4PropertyRequest",
-    "FetchConnectedGa4PropertyResponse",
     "FirebaseLink",
     "GetAccessBindingRequest",
     "GetAccountRequest",
@@ -504,6 +486,7 @@
     "GetMeasurementProtocolSecretRequest",
     "GetPropertyRequest",
     "GetReportingDataAnnotationRequest",
+    "GetReportingIdentitySettingsRequest",
     "GetRollupPropertySourceLinkRequest",
     "GetSKAdNetworkConversionValueSchemaRequest",
     "GetSearchAds360LinkRequest",
@@ -536,8 +519,6 @@
     "ListCalculatedMetricsResponse",
     "ListChannelGroupsRequest",
     "ListChannelGroupsResponse",
-    "ListConnectedSiteTagsRequest",
-    "ListConnectedSiteTagsResponse",
     "ListConversionEventsRequest",
     "ListConversionEventsResponse",
     "ListCustomDimensionsRequest",
@@ -592,6 +573,7 @@
     "ProvisionSubpropertyResponse",
     "ReorderEventEditRulesRequest",
     "ReportingDataAnnotation",
+    "ReportingIdentitySettings",
     "RollupPropertySourceLink",
     "RunAccessReportRequest",
     "RunAccessReportResponse",
@@ -600,8 +582,6 @@
     "SearchChangeHistoryEventsRequest",
     "SearchChangeHistoryEventsResponse",
     "ServiceLevel",
-    "SetAutomatedGa4ConfigurationOptOutRequest",
-    "SetAutomatedGa4ConfigurationOptOutResponse",
     "SubmitUserDeletionRequest",
     "SubmitUserDeletionResponse",
     "SubpropertyEventFilter",