Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions BUILD.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ exports_files([

EXPERIMENTAL_LIBRARIES = [
# Introduced circa 2022-07-12
"batch",
"run",
# Introduced circa 2022-06-22
"video",
Expand Down
9 changes: 5 additions & 4 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -99,11 +99,12 @@ For status on this, see https://github.com/googleapis/google-cloud-cpp/issues/88

### New Libraries

We are introducing a new client library for [Cloud Run]. While we do not
anticipate any API changes to this library before declaring it GA, we are
releasing it early in case it elicits some feedback that requires changes.
We are introducing 2 new client libraries for GCP services. While we do not
anticipate any API changes to these libraries before declaring them GA, we are
releasing them early in case they elicit some feedback that requires changes.

[Cloud Run]: https://github.com/googleapis/google-cloud-cpp/blob/main/google/cloud/run/README.md
* [Batch](https://github.com/googleapis/google-cloud-cpp/blob/main/google/cloud/batch/README.md)
* [Cloud Run](https://github.com/googleapis/google-cloud-cpp/blob/main/google/cloud/run/README.md)

## v2.0.0 - 2022-07

Expand Down
5 changes: 5 additions & 0 deletions ci/etc/expected_install_directories
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,10 @@
./include/google/cloud/baremetalsolution/internal
./include/google/cloud/baremetalsolution/mocks
./include/google/cloud/baremetalsolution/v2
./include/google/cloud/batch
./include/google/cloud/batch/internal
./include/google/cloud/batch/mocks
./include/google/cloud/batch/v1
./include/google/cloud/bigquery
./include/google/cloud/bigquery/connection
./include/google/cloud/bigquery/connection/v1
Expand Down Expand Up @@ -426,6 +430,7 @@
./lib64/cmake/google_cloud_cpp_assuredworkloads
./lib64/cmake/google_cloud_cpp_automl
./lib64/cmake/google_cloud_cpp_baremetalsolution
./lib64/cmake/google_cloud_cpp_batch
./lib64/cmake/google_cloud_cpp_bigquery
./lib64/cmake/google_cloud_cpp_bigtable
./lib64/cmake/google_cloud_cpp_billing
Expand Down
1 change: 1 addition & 0 deletions ci/etc/full_feature_list
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ asset
assuredworkloads
automl
baremetalsolution
batch
bigquery
bigtable
billing
Expand Down
7 changes: 7 additions & 0 deletions external/googleapis/protodeps/batch.deps
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
@com_google_googleapis//google/api:annotations_proto
@com_google_googleapis//google/api:client_proto
@com_google_googleapis//google/api:field_behavior_proto
@com_google_googleapis//google/api:http_proto
@com_google_googleapis//google/api:resource_proto
@com_google_googleapis//google/longrunning:operations_proto
@com_google_googleapis//google/rpc:status_proto
4 changes: 4 additions & 0 deletions external/googleapis/protolists/batch.list
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
@com_google_googleapis//google/cloud/batch/v1:batch.proto
@com_google_googleapis//google/cloud/batch/v1:job.proto
@com_google_googleapis//google/cloud/batch/v1:task.proto
@com_google_googleapis//google/cloud/batch/v1:volume.proto
1 change: 1 addition & 0 deletions external/googleapis/update_libraries.sh
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@ declare -A -r LIBRARIES=(
["assuredworkloads"]="@com_google_googleapis//google/cloud/assuredworkloads/v1:assuredworkloads_cc_grpc"
["automl"]="@com_google_googleapis//google/cloud/automl/v1:automl_cc_grpc"
["baremetalsolution"]="@com_google_googleapis//google/cloud/baremetalsolution/v2:baremetalsolution_cc_grpc"
["batch"]="@com_google_googleapis//google/cloud/batch/v1:batch_cc_grpc"
["bigquery"]="$(
printf ",%s" \
"@com_google_googleapis//google/cloud/bigquery/v2:bigquery_cc_grpc" \
Expand Down
8 changes: 8 additions & 0 deletions generator/generator_config.textproto
Original file line number Diff line number Diff line change
Expand Up @@ -105,6 +105,14 @@ service {
retryable_status_codes: ["kUnavailable"]
}

# Batch
service {
service_proto_path: "google/cloud/batch/v1/batch.proto"
product_path: "google/cloud/batch"
initial_copyright_year: "2022"
retryable_status_codes: ["kUnavailable"]
}

# BigQuery
service {
service_proto_path: "google/cloud/bigquery/storage/v1/storage.proto"
Expand Down
59 changes: 59 additions & 0 deletions google/cloud/batch/BUILD.bazel
Original file line number Diff line number Diff line change
@@ -0,0 +1,59 @@
# 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.
# You may obtain a copy of the License at
#
# https://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.

package(default_visibility = ["//visibility:private"])

licenses(["notice"]) # Apache 2.0

SOURCE_GLOB = "**/*.cc"

MOCK_SOURCE_GLOB = "mocks/*.cc"

HEADER_GLOB = "**/*.h"

MOCK_HEADER_GLOB = "mocks/*.h"

cc_library(
name = "google_cloud_cpp_batch",
srcs = glob(
include = [SOURCE_GLOB],
exclude = [MOCK_SOURCE_GLOB],
),
hdrs = glob(
include = [HEADER_GLOB],
exclude = [MOCK_HEADER_GLOB],
),
visibility = ["//:__pkg__"],
deps = [
"//:common",
"//:grpc_utils",
"@com_google_googleapis//google/cloud/batch/v1:batch_cc_grpc",
],
)

cc_library(
name = "google_cloud_cpp_batch_mocks",
srcs = glob(
include = [MOCK_SOURCE_GLOB],
),
hdrs = glob(
include = [MOCK_HEADER_GLOB],
),
visibility = ["//:__pkg__"],
deps = [
":google_cloud_cpp_batch",
"//:common",
"//:grpc_utils",
],
)
181 changes: 181 additions & 0 deletions google/cloud/batch/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,181 @@
# ~~~
# 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.
# You may obtain a copy of the License at
#
# https://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.
# ~~~

include(GoogleapisConfig)
set(DOXYGEN_PROJECT_NAME "Batch API C++ Client")
set(DOXYGEN_PROJECT_BRIEF "A C++ Client Library for the Batch API")
set(DOXYGEN_PROJECT_NUMBER "${PROJECT_VERSION} (Experimental)")
set(DOXYGEN_EXCLUDE_SYMBOLS "internal" "batch_internal" "batch_testing"
"examples")
set(DOXYGEN_EXAMPLE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/quickstart)

# Creates the proto headers needed by doxygen.
set(GOOGLE_CLOUD_CPP_DOXYGEN_DEPS google-cloud-cpp::batch_protos)

include(GoogleCloudCppCommon)

set(EXTERNAL_GOOGLEAPIS_SOURCE
"${PROJECT_BINARY_DIR}/external/googleapis/src/googleapis_download")
find_path(PROTO_INCLUDE_DIR google/protobuf/descriptor.proto)
if (PROTO_INCLUDE_DIR)
list(INSERT PROTOBUF_IMPORT_DIRS 0 "${PROTO_INCLUDE_DIR}")
endif ()

include(CompileProtos)
google_cloud_cpp_load_protolist(
proto_list
"${PROJECT_SOURCE_DIR}/external/googleapis/protolists/batch.list")
google_cloud_cpp_load_protodeps(
proto_deps "${PROJECT_SOURCE_DIR}/external/googleapis/protodeps/batch.deps")
google_cloud_cpp_grpcpp_library(
google_cloud_cpp_batch_protos # cmake-format: sort
${proto_list} PROTO_PATH_DIRECTORIES "${EXTERNAL_GOOGLEAPIS_SOURCE}"
"${PROTO_INCLUDE_DIR}")
external_googleapis_set_version_and_alias(batch_protos)
target_link_libraries(google_cloud_cpp_batch_protos PUBLIC ${proto_deps})

file(
GLOB source_files
RELATIVE "${CMAKE_CURRENT_SOURCE_DIR}"
"*.h" "*.cc" "internal/*.h" "internal/*.cc")
list(SORT source_files)
add_library(google_cloud_cpp_batch ${source_files})
target_include_directories(
google_cloud_cpp_batch
PUBLIC $<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}>
$<BUILD_INTERFACE:${PROJECT_BINARY_DIR}>
$<INSTALL_INTERFACE:include>)
target_link_libraries(
google_cloud_cpp_batch
PUBLIC google-cloud-cpp::grpc_utils google-cloud-cpp::common
google-cloud-cpp::batch_protos)
google_cloud_cpp_add_common_options(google_cloud_cpp_batch)
set_target_properties(
google_cloud_cpp_batch
PROPERTIES EXPORT_NAME google-cloud-cpp::experimental-batch
VERSION "${PROJECT_VERSION}"
SOVERSION "${PROJECT_VERSION_MAJOR}")
target_compile_options(google_cloud_cpp_batch
PUBLIC ${GOOGLE_CLOUD_CPP_EXCEPTIONS_FLAG})

add_library(google-cloud-cpp::experimental-batch ALIAS google_cloud_cpp_batch)

# Create a header-only library for the mocks. We use a CMake `INTERFACE` library
# for these, a regular library would not work on macOS (where the library needs
# at least one .o file). Unfortunately INTERFACE libraries are a bit weird in
# that they need absolute paths for their sources.
file(
GLOB relative_mock_files
RELATIVE "${CMAKE_CURRENT_SOURCE_DIR}"
"mocks/*.h")
list(SORT relative_mock_files)
set(mock_files)
foreach (file IN LISTS relative_mock_files)
list(APPEND mock_files "${CMAKE_CURRENT_SOURCE_DIR}/${file}")
endforeach ()
add_library(google_cloud_cpp_batch_mocks INTERFACE)
target_sources(google_cloud_cpp_batch_mocks INTERFACE ${mock_files})
target_link_libraries(
google_cloud_cpp_batch_mocks
INTERFACE google-cloud-cpp::experimental-batch GTest::gmock_main
GTest::gmock GTest::gtest)
set_target_properties(
google_cloud_cpp_batch_mocks
PROPERTIES EXPORT_NAME google-cloud-cpp::experimental-batch_mocks)
target_include_directories(
google_cloud_cpp_batch_mocks
INTERFACE $<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}>
$<BUILD_INTERFACE:${PROJECT_BINARY_DIR}>
$<INSTALL_INTERFACE:include>)
target_compile_options(google_cloud_cpp_batch_mocks
INTERFACE ${GOOGLE_CLOUD_CPP_EXCEPTIONS_FLAG})

include(CTest)
if (BUILD_TESTING)
add_executable(batch_quickstart "quickstart/quickstart.cc")
target_link_libraries(batch_quickstart
PRIVATE google-cloud-cpp::experimental-batch)
google_cloud_cpp_add_common_options(batch_quickstart)
add_test(
NAME batch_quickstart
COMMAND
cmake -P "${PROJECT_SOURCE_DIR}/cmake/quickstart-runner.cmake"
$<TARGET_FILE:batch_quickstart> GOOGLE_CLOUD_PROJECT
GOOGLE_CLOUD_CPP_TEST_REGION)
set_tests_properties(batch_quickstart
PROPERTIES LABELS "integration-test;quickstart")
endif ()

# Get the destination directories based on the GNU recommendations.
include(GNUInstallDirs)

# Export the CMake targets to make it easy to create configuration files.
install(
EXPORT google_cloud_cpp_batch-targets
DESTINATION "${CMAKE_INSTALL_LIBDIR}/cmake/google_cloud_cpp_batch"
COMPONENT google_cloud_cpp_development)

# Install the libraries and headers in the locations determined by
# GNUInstallDirs
install(
TARGETS google_cloud_cpp_batch google_cloud_cpp_batch_protos
EXPORT google_cloud_cpp_batch-targets
RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
COMPONENT google_cloud_cpp_runtime
LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
COMPONENT google_cloud_cpp_runtime
NAMELINK_SKIP
ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
COMPONENT google_cloud_cpp_development)
# With CMake-3.12 and higher we could avoid this separate command (and the
# duplication).
install(
TARGETS google_cloud_cpp_batch google_cloud_cpp_batch_protos
LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
COMPONENT google_cloud_cpp_development
NAMELINK_ONLY
ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
COMPONENT google_cloud_cpp_development)

google_cloud_cpp_install_proto_library_protos("google_cloud_cpp_batch_protos"
"${EXTERNAL_GOOGLEAPIS_SOURCE}")
google_cloud_cpp_install_proto_library_headers("google_cloud_cpp_batch_protos")
google_cloud_cpp_install_headers("google_cloud_cpp_batch"
"include/google/cloud/batch")
google_cloud_cpp_install_headers("google_cloud_cpp_batch_mocks"
"include/google/cloud/batch")

google_cloud_cpp_add_pkgconfig(
batch "The Batch API C++ Client Library"
"Provides C++ APIs to use the Batch API." "google_cloud_cpp_grpc_utils"
" google_cloud_cpp_common" " google_cloud_cpp_batch_protos")

# Create and install the CMake configuration files.
include(CMakePackageConfigHelpers)
configure_file("config.cmake.in" "google_cloud_cpp_batch-config.cmake" @ONLY)
write_basic_package_version_file(
"google_cloud_cpp_batch-config-version.cmake"
VERSION ${PROJECT_VERSION}
COMPATIBILITY ExactVersion)

install(
FILES
"${CMAKE_CURRENT_BINARY_DIR}/google_cloud_cpp_batch-config.cmake"
"${CMAKE_CURRENT_BINARY_DIR}/google_cloud_cpp_batch-config-version.cmake"
DESTINATION "${CMAKE_INSTALL_LIBDIR}/cmake/google_cloud_cpp_batch"
COMPONENT google_cloud_cpp_development)

external_googleapis_install_pc("google_cloud_cpp_batch_protos")
Loading