Skip to content
This repository has been archived by the owner on Sep 16, 2023. It is now read-only.

Commit

Permalink
feat!: regenerate with breaking v1p1beta1 and v1p2beta2 changes (#91)
Browse files Browse the repository at this point in the history
## Breaking Changes
* Remove SearchIamPolicies from v1p1beta1
* Remove SearchResources from v1p1beta1
* Remove ExportAssets from v1p2beta1
* Remove BatchGetAssetHistory from v1p2beta1

This PR was generated using Autosynth. 🌈

Synth log will be available here:
https://source.cloud.google.com/results/invocations/badf69d0-35e6-44bc-af51-7c1c8f83a086/targets
  • Loading branch information
yoshi-automation authored Feb 29, 2020
1 parent 984bc16 commit 1d6f33f
Show file tree
Hide file tree
Showing 88 changed files with 1,191 additions and 16,384 deletions.
51 changes: 40 additions & 11 deletions .kokoro/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -37,19 +37,23 @@ if [[ ! -z "${GOOGLE_APPLICATION_CREDENTIALS}" && "${GOOGLE_APPLICATION_CREDENTI
export GOOGLE_APPLICATION_CREDENTIALS=$(realpath ${KOKORO_ROOT}/src/${GOOGLE_APPLICATION_CREDENTIALS})
fi

RETURN_CODE=0
set +e

case ${JOB_TYPE} in
test)
mvn test -B -Dclirr.skip=true -Denforcer.skip=true
bash ${KOKORO_GFILE_DIR}/codecov.sh
bash .kokoro/coerce_logs.sh
RETURN_CODE=$?
;;
lint)
mvn \
-Penable-samples \
com.coveo:fmt-maven-plugin:check
RETURN_CODE=$?
;;
javadoc)
mvn javadoc:javadoc javadoc:test-javadoc
RETURN_CODE=$?
;;
integration)
mvn -B ${INTEGRATION_TEST_ARGS} \
Expand All @@ -59,21 +63,46 @@ integration)
-Denforcer.skip=true \
-fae \
verify
bash .kokoro/coerce_logs.sh
RETURN_CODE=$?
;;
samples)
mvn -B \
-Penable-samples \
-DtrimStackTrace=false \
-Dclirr.skip=true \
-Denforcer.skip=true \
-fae \
verify
bash .kokoro/coerce_logs.sh
if [[ -f samples/pom.xml ]]
then
pushd samples
mvn -B \
-Penable-samples \
-DtrimStackTrace=false \
-Dclirr.skip=true \
-Denforcer.skip=true \
-fae \
verify
RETURN_CODE=$?
popd
else
echo "no sample pom.xml found - skipping sample tests"
fi
;;
clirr)
mvn -B -Denforcer.skip=true clirr:check
RETURN_CODE=$?
;;
*)
;;
esac

if [ "${REPORT_COVERAGE}" == "true" ]
then
bash ${KOKORO_GFILE_DIR}/codecov.sh
fi

# fix output location of logs
bash .kokoro/coerce_logs.sh

if [[ "${ENABLE_BUILD_COP}" == "true" ]]
then
chmod +x ${KOKORO_GFILE_DIR}/linux_amd64/buildcop
${KOKORO_GFILE_DIR}/linux_amd64/buildcop -repo=googleapis/java-asset
fi

echo "exiting with ${RETURN_CODE}"
exit ${RETURN_CODE}
5 changes: 5 additions & 0 deletions .kokoro/continuous/java8.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -5,3 +5,8 @@ env_vars: {
key: "TRAMPOLINE_IMAGE"
value: "gcr.io/cloud-devrel-kokoro-resources/java8"
}

env_vars: {
key: "REPORT_COVERAGE"
value: "true"
}
14 changes: 14 additions & 0 deletions .kokoro/nightly/integration.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -5,3 +5,17 @@ env_vars: {
key: "TRAMPOLINE_IMAGE"
value: "gcr.io/cloud-devrel-kokoro-resources/java8"
}

env_vars: {
key: "ENABLE_BUILD_COP"
value: "true"
}

before_action {
fetch_keystore {
keystore_resource {
keystore_config_id: 73713
keyname: "java_it_service_account"
}
}
}
5 changes: 5 additions & 0 deletions .kokoro/nightly/java8.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -5,3 +5,8 @@ env_vars: {
key: "TRAMPOLINE_IMAGE"
value: "gcr.io/cloud-devrel-kokoro-resources/java8"
}

env_vars: {
key: "REPORT_COVERAGE"
value: "true"
}
21 changes: 13 additions & 8 deletions .kokoro/nightly/samples.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -2,23 +2,28 @@

# Configure the docker image for kokoro-trampoline.
env_vars: {
key: "TRAMPOLINE_IMAGE"
value: "gcr.io/cloud-devrel-kokoro-resources/java8"
key: "TRAMPOLINE_IMAGE"
value: "gcr.io/cloud-devrel-kokoro-resources/java8"
}

env_vars: {
key: "JOB_TYPE"
value: "samples"
key: "JOB_TYPE"
value: "samples"
}

env_vars: {
key: "GCLOUD_PROJECT"
value: "gcloud-devel"
key: "GCLOUD_PROJECT"
value: "gcloud-devel"
}

env_vars: {
key: "GOOGLE_APPLICATION_CREDENTIALS"
value: "keystore/73713_java_it_service_account"
key: "GOOGLE_APPLICATION_CREDENTIALS"
value: "keystore/73713_java_it_service_account"
}

env_vars: {
key: "ENABLE_BUILD_COP"
value: "true"
}

before_action {
Expand Down
5 changes: 5 additions & 0 deletions .kokoro/presubmit/java8.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -5,3 +5,8 @@ env_vars: {
key: "TRAMPOLINE_IMAGE"
value: "gcr.io/cloud-devrel-kokoro-resources/java8"
}

env_vars: {
key: "REPORT_COVERAGE"
value: "true"
}
8 changes: 5 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -20,13 +20,12 @@ If you are using Maven with [BOM][libraries-bom], add this to your pom.xml file
<dependency>
<groupId>com.google.cloud</groupId>
<artifactId>libraries-bom</artifactId>
<version>3.4.0</version>
<version>4.2.0</version>
<type>pom</type>
<scope>import</scope>
</dependency>
</dependencies>
</dependencyManagement>

<dependencies>
<dependency>
<groupId>com.google.cloud</groupId>
Expand Down Expand Up @@ -87,6 +86,8 @@ use this Cloud Asset Inventory Client Library.





## Troubleshooting

To get help, follow the instructions in the [shared Troubleshooting document][troubleshooting].
Expand Down Expand Up @@ -158,4 +159,5 @@ Java 11 | [![Kokoro CI][kokoro-badge-image-5]][kokoro-badge-link-5]
[license]: https://github.com/googleapis/java-asset/blob/master/LICENSE
[enable-billing]: https://cloud.google.com/apis/docs/getting-started#enabling_billing
[enable-api]: https://console.cloud.google.com/flows/enableapi?apiid=cloudasset.googleapis.com
[libraries-bom]: https://github.com/GoogleCloudPlatform/cloud-opensource-java/wiki/The-Google-Cloud-Platform-Libraries-BOM
[libraries-bom]: https://github.com/GoogleCloudPlatform/cloud-opensource-java/wiki/The-Google-Cloud-Platform-Libraries-BOM
[shell_img]: https://gstatic.com/cloudssh/images/open-btn.png
53 changes: 53 additions & 0 deletions google-cloud-asset/clirr-ignored-differences.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,53 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- see http://www.mojohaus.org/clirr-maven-plugin/examples/ignored-differences.html -->
<differences>
<!-- TODO: remove after 0.119 is released -->
<difference>
<differenceType>7002</differenceType>
<className>com/google/cloud/asset/v1p1beta1/AssetServiceClient</className>
<method>*</method>
</difference>
<difference>
<differenceType>7002</differenceType>
<className>com/google/cloud/asset/v1p1beta1/AssetServiceSettings*</className>
<method>*</method>
</difference>
<difference>
<differenceType>7002</differenceType>
<className>com/google/cloud/asset/v1p1beta1/stub/AssetServiceStub*</className>
<method>*</method>
</difference>
<difference>
<differenceType>7002</differenceType>
<className>com/google/cloud/asset/v1p1beta1/stub/GrpcAssetServiceStub*</className>
<method>*</method>
</difference>
<difference>
<differenceType>7002</differenceType>
<className>com/google/cloud/asset/v1p2beta1/AssetServiceClient</className>
<method>*</method>
</difference>
<difference>
<differenceType>7002</differenceType>
<className>com/google/cloud/asset/v1p2beta1/AssetServiceSettings*</className>
<method>*</method>
</difference>
<difference>
<differenceType>7002</differenceType>
<className>com/google/cloud/asset/v1p2beta1/stub/AssetServiceStub*</className>
<method>*</method>
</difference>
<difference>
<differenceType>7002</differenceType>
<className>com/google/cloud/asset/v1p2beta1/stub/GrpcAssetServiceStub*</className>
<method>*</method>
</difference>
<difference>
<differenceType>8001</differenceType>
<className>com/google/cloud/asset/v1p1beta1/AssetServiceClient$SearchIam*</className>
</difference>
<difference>
<differenceType>8001</differenceType>
<className>com/google/cloud/asset/v1p1beta1/AssetServiceClient$SearchResources*</className>
</difference>
</differences>
Original file line number Diff line number Diff line change
Expand Up @@ -54,8 +54,12 @@
* <code>
* AssetServiceSettings.Builder assetServiceSettingsBuilder =
* AssetServiceSettings.newBuilder();
* assetServiceSettingsBuilder.createFeedSettings().getRetrySettings().toBuilder()
* .setTotalTimeout(Duration.ofSeconds(30));
* assetServiceSettingsBuilder
* .createFeedSettings()
* .setRetrySettings(
* assetServiceSettingsBuilder.createFeedSettings().getRetrySettings().toBuilder()
* .setTotalTimeout(Duration.ofSeconds(30))
* .build());
* AssetServiceSettings assetServiceSettings = assetServiceSettingsBuilder.build();
* </code>
* </pre>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -77,8 +77,12 @@
* <code>
* AssetServiceStubSettings.Builder assetServiceSettingsBuilder =
* AssetServiceStubSettings.newBuilder();
* assetServiceSettingsBuilder.createFeedSettings().getRetrySettings().toBuilder()
* .setTotalTimeout(Duration.ofSeconds(30));
* assetServiceSettingsBuilder
* .createFeedSettings()
* .setRetrySettings(
* assetServiceSettingsBuilder.createFeedSettings().getRetrySettings().toBuilder()
* .setTotalTimeout(Duration.ofSeconds(30))
* .build());
* AssetServiceStubSettings assetServiceSettings = assetServiceSettingsBuilder.build();
* </code>
* </pre>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -53,8 +53,12 @@
* <code>
* AssetServiceSettings.Builder assetServiceSettingsBuilder =
* AssetServiceSettings.newBuilder();
* assetServiceSettingsBuilder.batchGetAssetsHistorySettings().getRetrySettings().toBuilder()
* .setTotalTimeout(Duration.ofSeconds(30));
* assetServiceSettingsBuilder
* .batchGetAssetsHistorySettings()
* .setRetrySettings(
* assetServiceSettingsBuilder.batchGetAssetsHistorySettings().getRetrySettings().toBuilder()
* .setTotalTimeout(Duration.ofSeconds(30))
* .build());
* AssetServiceSettings assetServiceSettings = assetServiceSettingsBuilder.build();
* </code>
* </pre>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -69,8 +69,12 @@
* <code>
* AssetServiceStubSettings.Builder assetServiceSettingsBuilder =
* AssetServiceStubSettings.newBuilder();
* assetServiceSettingsBuilder.batchGetAssetsHistorySettings().getRetrySettings().toBuilder()
* .setTotalTimeout(Duration.ofSeconds(30));
* assetServiceSettingsBuilder
* .batchGetAssetsHistorySettings()
* .setRetrySettings(
* assetServiceSettingsBuilder.batchGetAssetsHistorySettings().getRetrySettings().toBuilder()
* .setTotalTimeout(Duration.ofSeconds(30))
* .build());
* AssetServiceStubSettings assetServiceSettings = assetServiceSettingsBuilder.build();
* </code>
* </pre>
Expand Down
Loading

0 comments on commit 1d6f33f

Please sign in to comment.