feat: add Skaffold remote config support for GCB repos

Google APIs · copybara-github · commit 357c057a1b8d · 2024-04-19T06:21:11.000-07:00
docs: clarified related comments

PiperOrigin-RevId: 626346409
diff --git a/google/cloud/deploy/v1/BUILD.bazel b/google/cloud/deploy/v1/BUILD.bazel
@@ -9,14 +9,17 @@
 #    * extra_protoc_file_parameters
 # The complete list of preserved parameters can be found in the source code.
 
+# buildifier: disable=load-on-top
+
 # This is an API workspace, having public visibility by default makes perfect sense.
 package(default_visibility = ["//visibility:public"])
 
 ##############################################################################
 # Common
 ##############################################################################
-load("@rules_proto//proto:defs.bzl", "proto_library")
+# buildifier: disable=same-origin-load
 load("@com_google_googleapis_imports//:imports.bzl", "proto_library_with_info")
+load("@rules_proto//proto:defs.bzl", "proto_library")
 
 proto_library(
     name = "deploy_proto",
@@ -60,6 +63,7 @@ proto_library_with_info(
 ##############################################################################
 # Java
 ##############################################################################
+# buildifier: disable=same-origin-load
 load(
     "@com_google_googleapis_imports//:imports.bzl",
     "java_gapic_assembly_gradle_pkg",
@@ -126,6 +130,7 @@ java_gapic_assembly_gradle_pkg(
 ##############################################################################
 # Go
 ##############################################################################
+# buildifier: disable=same-origin-load
 load(
     "@com_google_googleapis_imports//:imports.bzl",
     "go_gapic_assembly_pkg",
@@ -181,6 +186,7 @@ go_gapic_assembly_pkg(
 ##############################################################################
 # Python
 ##############################################################################
+# buildifier: disable=same-origin-load
 load(
     "@com_google_googleapis_imports//:imports.bzl",
     "py_gapic_assembly_pkg",
@@ -221,6 +227,7 @@ py_gapic_assembly_pkg(
 ##############################################################################
 # PHP
 ##############################################################################
+# buildifier: disable=same-origin-load
 load(
     "@com_google_googleapis_imports//:imports.bzl",
     "php_gapic_assembly_pkg",
@@ -258,6 +265,7 @@ php_gapic_assembly_pkg(
 ##############################################################################
 # Node.js
 ##############################################################################
+# buildifier: disable=same-origin-load
 load(
     "@com_google_googleapis_imports//:imports.bzl",
     "nodejs_gapic_assembly_pkg",
@@ -288,6 +296,7 @@ nodejs_gapic_assembly_pkg(
 ##############################################################################
 # Ruby
 ##############################################################################
+# buildifier: disable=same-origin-load
 load(
     "@com_google_googleapis_imports//:imports.bzl",
     "ruby_cloud_gapic_library",
@@ -342,6 +351,7 @@ ruby_gapic_assembly_pkg(
 ##############################################################################
 # C#
 ##############################################################################
+# buildifier: disable=same-origin-load
 load(
     "@com_google_googleapis_imports//:imports.bzl",
     "csharp_gapic_assembly_pkg",
@@ -352,7 +362,6 @@ load(
 
 csharp_proto_library(
     name = "deploy_csharp_proto",
-    extra_opts = [],
     deps = [":deploy_proto"],
 )
 
@@ -389,6 +398,7 @@ csharp_gapic_assembly_pkg(
 ##############################################################################
 # C++
 ##############################################################################
+# buildifier: disable=same-origin-load
 load(
     "@com_google_googleapis_imports//:imports.bzl",
     "cc_grpc_library",
diff --git a/google/cloud/deploy/v1/cloud_deploy.proto b/google/cloud/deploy/v1/cloud_deploy.proto
@@ -35,6 +35,10 @@ option (google.api.resource_definition) = {
   type: "cloudbuild.googleapis.com/Build"
   pattern: "projects/{project}/locations/{location}/builds/{build}"
 };
+option (google.api.resource_definition) = {
+  type: "cloudbuild.googleapis.com/Repository"
+  pattern: "projects/{project}/locations/{location}/connections/{connection}/repositories/{repository}"
+};
 option (google.api.resource_definition) = {
   type: "container.googleapis.com/Cluster"
   pattern: "projects/{project}/locations/{location}/clusters/{cluster}"
@@ -1606,7 +1610,7 @@ message SkaffoldModules {
     // Optional. Relative path from the repository root to the Skaffold file.
     string path = 2 [(google.api.field_behavior) = OPTIONAL];
 
-    // Optional. Git ref the package should be cloned from.
+    // Optional. Git branch or tag to use when cloning the repository.
     string ref = 3 [(google.api.field_behavior) = OPTIONAL];
   }
 
@@ -1621,6 +1625,26 @@ message SkaffoldModules {
     string path = 2 [(google.api.field_behavior) = OPTIONAL];
   }
 
+  // Cloud Build V2 Repository containing Skaffold Configs.
+  message SkaffoldGCBRepoSource {
+    // Required. Name of the Cloud Build V2 Repository.
+    // Format is
+    // projects/{project}/locations/{location}/connections/{connection}/repositories/{repository}.
+    string repository = 1 [
+      (google.api.field_behavior) = REQUIRED,
+      (google.api.resource_reference) = {
+        type: "cloudbuild.googleapis.com/Repository"
+      }
+    ];
+
+    // Optional. Relative path from the repository root to the Skaffold Config
+    // file.
+    string path = 2 [(google.api.field_behavior) = OPTIONAL];
+
+    // Optional. Branch or tag to use when cloning the repository.
+    string ref = 3 [(google.api.field_behavior) = OPTIONAL];
+  }
+
   // Optional. The Skaffold Config modules to use from the specified source.
   repeated string configs = 1 [(google.api.field_behavior) = OPTIONAL];
 
@@ -1631,6 +1655,9 @@ message SkaffoldModules {
 
     // Cloud Storage bucket containing the Skaffold Config modules.
     SkaffoldGCSSource google_cloud_storage = 3;
+
+    // Cloud Build V2 repository containing the Skaffold Config modules.
+    SkaffoldGCBRepoSource google_cloud_build_repo = 4;
   }
 }
 
diff --git a/google/cloud/deploy/v1/clouddeploy_v1.yaml b/google/cloud/deploy/v1/clouddeploy_v1.yaml
@@ -62,12 +62,15 @@ http:
     get: '/v1/{resource=projects/*/locations/*/deliveryPipelines/*}:getIamPolicy'
     additional_bindings:
     - get: '/v1/{resource=projects/*/locations/*/targets/*}:getIamPolicy'
+    - get: '/v1/{resource=projects/*/locations/*/customTargetTypes/*}:getIamPolicy'
   - selector: google.iam.v1.IAMPolicy.SetIamPolicy
     post: '/v1/{resource=projects/*/locations/*/deliveryPipelines/*}:setIamPolicy'
     body: '*'
     additional_bindings:
     - post: '/v1/{resource=projects/*/locations/*/targets/*}:setIamPolicy'
       body: '*'
+    - post: '/v1/{resource=projects/*/locations/*/customTargetTypes/*}:setIamPolicy'
+      body: '*'
   - selector: google.iam.v1.IAMPolicy.TestIamPermissions
     post: '/v1/{resource=projects/*/locations/*/deliveryPipelines/*}:testIamPermissions'
     body: '*'
