fix: update owlbot.yaml files to copy generated samples directory fro…

.github/release-please.yml

@@ -1,6 +1,4 @@
 primaryBranch: main
 releaseType: java-yoshi
-versioning: always-bump-patch
+manifest: true
 handleGHRelease: true
-
-

.github/workflows/versions.yaml

@@ -18,10 +18,21 @@ on:
     branches:
     - main
   pull_request:
-name: unmanaged versions check
+name: versions check
 jobs:
-  check:
+  unmanaged-versions-check:
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v3
-    - run: ./generation/check_non_release_please_versions.sh
+    - run: ./generation/check_non_release_please_versions.sh
+
+  # For Release Please pull requests, the artifacts being published must not
+  # have the duplicate versions in Maven Central
+  existing-versions-check:
+    runs-on: ubuntu-latest
+    if: github.repository_owner == 'googleapis' && github.head_ref == 'release-please--branches--main'
+    steps:
+    - run: sudo apt-get update -y
+    - run: sudo apt-get install libxml2-utils
+    - uses: actions/checkout@v3
+    - run: ./generation/check_existing_release_versions.sh

.release-please-manifest.json

@@ -0,0 +1,3 @@
+{
+  ".": "0.200.0"
+}

gapic-libraries-bom/pom.xml

@@ -984,7 +984,7 @@
         <version>2.6.1-SNAPSHOT</version><!-- {x-version-update:grafeas:current} -->
       </dependency>
       <dependency>
-          <groupId>com.google.cloud</groupId>
+        <groupId>com.google.cloud</groupId>
         <artifactId>google-cloud-notification</artifactId>
         <version>0.123.22-beta-SNAPSHOT</version><!-- {x-version-update:google-cloud-notification:current} -->
       </dependency>

generate-readme.py

@@ -101,8 +101,7 @@ def client_for_repo(repo_slug) -> Optional[CloudClient]:
 def client_for_module(module) -> Optional[CloudClient]:
   with open ('%s/.repo-metadata.json' % module, "r") as metadata_file:
     data = json.load(metadata_file)
-    monorepo_module = data['repo'].replace('googleapis/', '')
-    data['repo'] = 'googleapis/google-cloud-java/tree/main/%s' % monorepo_module
+    data['repo'] = 'googleapis/google-cloud-java/tree/main/%s' % module
     return CloudClient(data)
 
 # These repositories are not meant as shown as Cloud SDK for Java

generation/add_snippetdirectory_owlbot.sh

@@ -0,0 +1,61 @@
+#!/bin/bash
+
+# If generated samples directory doesn't exist yet, add it to the owlbot config
+
+# Usage:
+# add_snippetdirectory_owlbot.sh <.OwlBot.yaml path from the root>
+# Example:
+# $ add_snippetdirectory_owlbot.sh java-dataform/.OwlBot.yaml
+#
+# To apply the change to all OwlBot configuration files in all modules:
+# $ for F in `find . -maxdepth 2 -name '.OwlBot.yaml'`; do sh generation/add_snippetdirectory_owlbot.sh $F; done
+
+OWLBOT_FILE=$1
+
+if [ -z "${OWLBOT_FILE}" ]; then
+  echo "Please specify file name"
+  exit 1
+fi
+
+if [ ! -r "${OWLBOT_FILE}" ]; then
+  echo "File not found"
+  exit 1
+fi
+
+dir_name=$(dirname "${OWLBOT_FILE}")
+module_name=$(basename "${dir_name}")
+
+if [ ! -d "${module_name}" ]; then
+  echo "module ${module_name} does not exist"
+  exit 1
+fi
+
+
+
+# If snippets are already being copied, exit out
+if grep -q samples/snippets/generated ${OWLBOT_FILE}; then
+  echo "module ${module_name} already copies generated snippets"
+  exit 1
+  fi
+
+
+# Insert into `deep-remove-regex:` section
+deep_remove_regex="- \"\/${module_name}\/samples\/snippets\/generated\""
+entry_before_deep_remove_regex="${module_name}\/google-.*\/src"
+sed -i "/${entry_before_deep_remove_regex}/a ${deep_remove_regex}" ${OWLBOT_FILE}
+
+# Insert into `deep-copy-regex:` section
+deep_copy_regex="- source: \"/google/cloud/${dir_name}/(v.*)/.*-java/samples/snippets/generated\"\n  dest: \"/owl-bot-staging/${module_name}/\$1/samples/snippets/generated\""
+
+entry_before_deep_copy_regex="dest: \"\/owl-bot-staging\/${module_name}\/\$1\/google-"
+
+sed -i "/${entry_before_deep_copy_regex}/a ${deep_copy_regex}" ${OWLBOT_FILE}
+
+# Remove duplicate lines
+perl -i -ne 'if ( /^\s*#/ ) { print } else { print if ! $SEEN{$_}++}' ${OWLBOT_FILE}
+
+# Add back new lines between sections
+sed -i  's/deep-copy-regex/\n&/g'  ${OWLBOT_FILE}
+sed -i  's/deep-remove-regex/\n&/g'  ${OWLBOT_FILE}
+sed -i  's/deep-preserve-regex/\n&/g'  ${OWLBOT_FILE}
+sed -i  's/api-name/\n&/g'  ${OWLBOT_FILE}

generation/check_existing_release_versions.sh

@@ -0,0 +1,47 @@
+#!/bin/bash
+
+# Using Google Mirror to avoid unnecessary load to https://repo1.maven.org/maven2
+MAVEN_SITE=https://maven-central.storage-download.googleapis.com/maven2
+
+set -e
+
+function find_existing_version_pom() {  
+  local pom_file=$1
+  if [ -z "${pom_file}" ]; then
+    echo "Empty pom file name"
+    exit 1
+  fi
+  local group_id=$(xmllint --xpath '/*[local-name()="project"]/*[local-name()="groupId"]/text()' \
+      "${pom_file}")
+  local artifact_id=$(xmllint --xpath '/*[local-name()="project"]/*[local-name()="artifactId"]/text()' \
+      "${pom_file}")
+  local version=$(xmllint --xpath '/*[local-name()="project"]/*[local-name()="version"]/text()' \
+      "${pom_file}")
+  echo -n "Checking ${group_id}:${artifact_id}:${version}:"
+  if [ -z "${group_id}" ] || [ -z "${artifact_id}" ] || [ -z "${version}" ]; then
+    echo "Couldn't parse the pom file: $pom_file"
+    exit 1
+  fi
+  if [[ "${version}" == *SNAPSHOT* ]] && [ "${artifact_id}" != "google-cloud-java" ]; then
+    echo " Release Please pull request contains SNAPSHOT version. Please investigate."
+    return_code=1
+  fi
+  local group_id_dir="${group_id//\.//}"
+  local URL="${MAVEN_SITE}/${group_id_dir}/${artifact_id}/${version}/${artifact_id}-${version}.pom"
+  local status_code=$(curl --silent --head -o /dev/null -w "%{http_code}" $URL)
+  if [ "${status_code}" == "404" ]; then
+    echo " The version does not exists. Good"
+  else
+    echo " The version already exists at ${URL}. Please investigate."
+    return_code=1
+  fi
+
+}
+
+return_code=0
+
+for pom_file in $(find . -maxdepth 3 -name pom.xml|sort --dictionary-order); do
+  find_existing_version_pom "${pom_file}"
+done
+
+exit ${return_code}

generation/generate_root_versions_txt.sh

@@ -1,23 +1,23 @@
 #!/bin/bash
 
+# This script adds the contents of a module's versions.txt to root versions.txt and then deletes it.
+# This should be run during addition of a new-module to the monorepo
+
 set -e
 
 GENERATION_DIR=$(dirname -- "$0")
 
-rm -f versions.txt
-
-echo "# Format:" >> versions.txt
-echo "# module:released-version:current-version" >> versions.txt
-
 module_list=$(find . -mindepth 2 -maxdepth 2 -name pom.xml | sort --dictionary-order |xargs dirname)
 
 for path in $module_list; do
-
-  cat ${path}/versions.txt | while read LINE; do
-    if ! [[ $LINE == *"#"* ]] && [ "$LINE" != "" ]; then
-      echo $LINE >> versions.txt
-    fi
-  done
-
+  FILE=${path}/versions.txt
+  if [ -f ${FILE} ]; then
+    cat ${path}/versions.txt | while read LINE; do
+      if ! [[ $LINE == *"#"* ]] && [ "$LINE" != "" ]; then
+        echo $LINE >> versions.txt
+      fi
+    done
+  fi
+  rm -f ${FILE}
 done
 

generation/new_client/templates/owlbot.yaml.monorepo.j2

@@ -17,6 +17,7 @@ deep-remove-regex:
 - "/{{ module_name }}/grpc-google-.*/src"
 - "/{{ module_name }}/proto-google-.*/src"
 - "/{{ module_name }}/google-.*/src"
+- "/{{ module_name }}/samples/snippets/generated"
 
 deep-preserve-regex:
 - "/{{ module_name }}/google-.*/src/test/java/com/google/cloud/.*/v.*/it/IT.*Test.java"
@@ -28,6 +29,8 @@ deep-copy-regex:
   dest: "/owl-bot-staging/{{ module_name }}/$1/grpc-{{ artifact_name }}-$1/src"
 - source: "/{{ proto_path }}/(v.*)/.*-java/gapic-google-.*/src"
   dest: "/owl-bot-staging/{{ module_name }}/$1/{{ artifact_name }}/src"
+- source: "/{{ proto_path }}/(v.*)/.*-java/samples/snippets/generated"
+  dest: "/owl-bot-staging/{{ module_name }}/$1/samples/snippets/generated"
 {% endif %}
 
 api-name: {{ module_name }}

generation/set_owlbot_config.sh

@@ -42,3 +42,4 @@ sed -i.bak "s|\"/samples|\"/${module_name}/samples|" "${OWLBOT_FILE}" && rm "${O
 if grep --quiet 'owl-bot-staging/$1' "${OWLBOT_FILE}"; then
   sed -i.bak "s|owl-bot-staging|owl-bot-staging/${module_name}|" "${OWLBOT_FILE}" && rm "${OWLBOT_FILE}".bak
 fi
+

google-cloud-jar-parent/pom.xml

@@ -39,7 +39,7 @@
       <dependency>
         <groupId>com.google.cloud</groupId>
         <artifactId>google-cloud-pubsub-bom</artifactId>
-        <version>1.120.24</version>
+        <version>1.120.25</version>
         <type>pom</type>
         <scope>import</scope>
       </dependency>

java-accessapproval/.repo-metadata.json

@@ -3,12 +3,12 @@
     "name_pretty": "Access Approval",
     "product_documentation": "https://cloud.google.com/access-approval/docs/",
     "api_description": "enables controlling access to your organization's data by Google personnel.",
-    "client_documentation": "https://cloud.google.com/java/docs/reference/google-cloud-accessapproval/latest/history",
+    "client_documentation": "https://cloud.google.com/java/docs/reference/google-cloud-accessapproval/latest/overview",
     "release_level": "stable",
     "transport": "grpc",
     "requires_billing": true,
     "language": "java",
-    "repo": "googleapis/java-accessapproval",
+    "repo": "googleapis/google-cloud-java",
     "repo_short": "java-accessapproval",
     "distribution_name": "com.google.cloud:google-cloud-accessapproval",
     "api_id": "accessapproval.googleapis.com",

java-accessapproval/README.md

@@ -158,7 +158,7 @@ Java 11 | [![Kokoro CI][kokoro-badge-image-5]][kokoro-badge-link-5]
 Java is a registered trademark of Oracle and/or its affiliates.
 
 [product-docs]: https://cloud.google.com/access-approval/docs/
-[javadocs]: https://cloud.google.com/java/docs/reference/google-cloud-accessapproval/latest/history
+[javadocs]: https://cloud.google.com/java/docs/reference/google-cloud-accessapproval/latest/overview
 [kokoro-badge-image-1]: http://storage.googleapis.com/cloud-devrel-public/java/badges/java-accessapproval/java7.svg
 [kokoro-badge-link-1]: http://storage.googleapis.com/cloud-devrel-public/java/badges/java-accessapproval/java7.html
 [kokoro-badge-image-2]: http://storage.googleapis.com/cloud-devrel-public/java/badges/java-accessapproval/java8.svg

java-accesscontextmanager/.OwlBot.yaml

@@ -15,6 +15,7 @@
 
 deep-remove-regex:
 - "/java-accesscontextmanager/proto-google-.*/src"
+- "/java-accesscontextmanager/samples/snippets/generated"
 
 deep-preserve-regex:
 - "/java-accesscontextmanager/google-.*/src/test/java/com/google/cloud/.*/v.*/it/IT.*Test.java"
@@ -28,5 +29,8 @@ deep-copy-regex:
   dest: "/owl-bot-staging/java-accesscontextmanager/$1/google-identity-accesscontextmanager/src"
 - source: "/google/identity/accesscontextmanager/type/.*-java/proto-google-.*/src"
   dest: "/owl-bot-staging/java-accesscontextmanager/type/proto-google-identity-accesscontextmanager-type/src"
+- source: "/google/identity/accesscontextmanager/(v.*)/.*-java/samples/snippets/generated"
+  dest: "/owl-bot-staging/java-accesscontextmanager/$1/samples/snippets/generated"
+
 
 api-name: accesscontextmanager

java-accesscontextmanager/.repo-metadata.json

@@ -3,12 +3,12 @@
     "name_pretty": "Identity Access Context Manager",
     "product_documentation": "n/a",
     "api_description": "n/a",
-    "client_documentation": "https://googleapis.dev/java/proto-google-identity-accesscontextmanager-v1/latest/index.html",
+    "client_documentation": "https://cloud.google.com/java/docs/reference/google-identity-accesscontextmanager/latest/overview",
     "release_level": "stable",
     "transport": "grpc",
     "requires_billing": true,
     "language": "java",
-    "repo": "googleapis/java-accesscontextmanager",
+    "repo": "googleapis/google-cloud-java",
     "repo_short": "java-accesscontextmanager",
     "distribution_name": "com.google.cloud:google-identity-accesscontextmanager",
     "library_type": "GAPIC_AUTO"

java-aiplatform/.OwlBot.yaml

@@ -17,6 +17,7 @@ deep-remove-regex:
 - "/java-aiplatform/grpc-google-.*/src"
 - "/java-aiplatform/proto-google-.*/src"
 - "/java-aiplatform/google-.*/src/main/java/com/google/cloud/aiplatform/v1"
+- "/java-aiplatform/samples/snippets/generated"
 - "/java-aiplatform/google-.*/src/main/java/com/google/cloud/aiplatform/v1beta1"
 
 deep-copy-regex:
@@ -26,5 +27,7 @@ deep-copy-regex:
   dest: "/owl-bot-staging/java-aiplatform/$1/grpc-google-cloud-aiplatform-$1/src"
 - source: "/google/cloud/aiplatform/(v.*)/.*-java/gapic-google-.*/src"
   dest: "/owl-bot-staging/java-aiplatform/$1/google-cloud-aiplatform/src"
+- source: "/google/cloud/./java-aiplatform/(v.*)/.*-java/samples/snippets/generated"
+  dest: "/owl-bot-staging/java-aiplatform/$1/samples/snippets/generated"
 
 api-name: aiplatform

java-aiplatform/.repo-metadata.json

@@ -3,11 +3,11 @@
   "name_pretty": "Vertex AI",
   "product_documentation": "https://cloud.google.com/vertex-ai/docs",
   "api_description": "is an integrated suite of machine learning tools and services for building and using ML models with AutoML or custom code. It offers both novices and experts the best workbench for the entire machine learning development lifecycle.",
-  "client_documentation": "https://cloud.google.com/java/docs/reference/google-cloud-aiplatform/latest/history",
+  "client_documentation": "https://cloud.google.com/java/docs/reference/google-cloud-aiplatform/latest/overview",
   "release_level": "stable",
   "transport": "grpc",
   "language": "java",
-  "repo": "googleapis/java-aiplatform",
+  "repo": "googleapis/google-cloud-java",
   "repo_short": "java-aiplatform",
   "distribution_name": "com.google.cloud:google-cloud-aiplatform",
   "api_id": "aiplatform.googleapis.com",

java-aiplatform/README.md

@@ -158,7 +158,7 @@ Java 11 | [![Kokoro CI][kokoro-badge-image-5]][kokoro-badge-link-5]
 Java is a registered trademark of Oracle and/or its affiliates.
 
 [product-docs]: https://cloud.google.com/vertex-ai/docs
-[javadocs]: https://cloud.google.com/java/docs/reference/google-cloud-aiplatform/latest/history
+[javadocs]: https://cloud.google.com/java/docs/reference/google-cloud-aiplatform/latest/overview
 [kokoro-badge-image-1]: http://storage.googleapis.com/cloud-devrel-public/java/badges/java-aiplatform/java7.svg
 [kokoro-badge-link-1]: http://storage.googleapis.com/cloud-devrel-public/java/badges/java-aiplatform/java7.html
 [kokoro-badge-image-2]: http://storage.googleapis.com/cloud-devrel-public/java/badges/java-aiplatform/java8.svg

java-analytics-admin/.OwlBot.yaml

@@ -17,6 +17,7 @@ deep-remove-regex:
 - "/java-analytics-admin/grpc-google-.*/src"
 - "/java-analytics-admin/proto-google-.*/src"
 - "/java-analytics-admin/google-.*/src"
+- "/java-analytics-admin/samples/snippets/generated"
 
 deep-copy-regex:
 - source: "/google/analytics/admin/(v.*)/.*-java/proto-google-.*/src"
@@ -25,5 +26,7 @@ deep-copy-regex:
   dest: "/owl-bot-staging/java-analytics-admin/$1/grpc-google-analytics-admin-$1/src"
 - source: "/google/analytics/admin/(v.*)/.*-java/gapic-google-.*/src"
   dest: "/owl-bot-staging/java-analytics-admin/$1/google-analytics-admin/src"
+- source: "/google/cloud/./java-analytics-admin/(v.*)/.*-java/samples/snippets/generated"
+  dest: "/owl-bot-staging/java-analytics-admin/$1/samples/snippets/generated"
 
 api-name: analyticsadmin

java-analytics-admin/.repo-metadata.json

@@ -3,11 +3,11 @@
     "name_pretty": "Analytics Admin",
     "product_documentation": "https://developers.google.com/analytics",
     "api_description": "allows you to manage Google Analytics accounts and properties.",
-    "client_documentation": "https://googleapis.dev/java/google-analytics-admin/latest/index.html",
+    "client_documentation": "https://cloud.google.com/java/docs/reference/google-analytics-admin/latest/overview",
     "release_level": "preview",
     "transport": "grpc",
     "language": "java",
-    "repo": "googleapis/java-analytics-admin",
+    "repo": "googleapis/google-cloud-java",
     "repo_short": "java-analytics-admin",
     "distribution_name": "com.google.analytics:google-analytics-admin",
     "api_id": "analyticsadmin.googleapis.com",

java-analytics-data/.OwlBot.yaml

@@ -17,6 +17,7 @@ deep-remove-regex:
 - "/java-analytics-data/grpc-google-.*/src"
 - "/java-analytics-data/proto-google-.*/src"
 - "/java-analytics-data/google-.*/src"
+- "/java-analytics-data/samples/snippets/generated"
 
 deep-copy-regex:
 - source: "/google/analytics/data/(v.*)/.*-java/proto-google-.*/src"
@@ -25,5 +26,7 @@ deep-copy-regex:
   dest: "/owl-bot-staging/java-analytics-data/$1/grpc-google-analytics-data-$1/src"
 - source: "/google/analytics/data/(v.*)/.*-java/gapic-google-.*/src"
   dest: "/owl-bot-staging/java-analytics-data/$1/google-analytics-data/src"
+- source: "/google/cloud/./java-analytics-data/(v.*)/.*-java/samples/snippets/generated"
+  dest: "/owl-bot-staging/java-analytics-data/$1/samples/snippets/generated"
 
 api-name: analyticsdata

java-analytics-data/.repo-metadata.json

@@ -3,11 +3,11 @@
     "name_pretty": "Analytics Data",
     "product_documentation": "https://developers.google.com/analytics/trusted-testing/analytics-data",
     "api_description": "provides programmatic methods to access report data in Google Analytics App+Web properties.",
-    "client_documentation": "https://googleapis.dev/java/google-analytics-data/latest/index.html",
+    "client_documentation": "https://cloud.google.com/java/docs/reference/google-analytics-data/latest/overview",
     "release_level": "preview",
     "transport": "grpc",
     "language": "java",
-    "repo": "googleapis/java-analytics-data",
+    "repo": "googleapis/google-cloud-java",
     "repo_short": "java-analytics-data",
     "distribution_name": "com.google.analytics:google-analytics-data",
     "api_id": "analytics-data.googleapis.com",