From c5c009723c0aa0d4c2bfed7886ddd4669e661e40 Mon Sep 17 00:00:00 2001 From: mattsanta Date: Mon, 26 Feb 2024 15:57:38 +0000 Subject: [PATCH 1/3] Add IAM resources for Cloud Deploy Custom Target Type --- mmv1/products/clouddeploy/CustomTargetType.yaml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/mmv1/products/clouddeploy/CustomTargetType.yaml b/mmv1/products/clouddeploy/CustomTargetType.yaml index d805ae20bbb..eeda865485d 100644 --- a/mmv1/products/clouddeploy/CustomTargetType.yaml +++ b/mmv1/products/clouddeploy/CustomTargetType.yaml @@ -48,6 +48,12 @@ import_format: [ 'projects/{{project}}/locations/{{location}}/customTargetTypes/{{name}}' ] +iam_policy: !ruby/object:Api::Resource::IamPolicy + parent_resource_attribute: 'name' + method_name_separator: ':' + import_format: [ + 'projects/{{project}}/locations/{{location}}/customTargetTypes/{{name}}' + ] examples: - !ruby/object:Provider::Terraform::Examples name: "clouddeploy_custom_target_type_basic" From 6ab0637c5af75fe4cb3a6cdfcccc18a977e7ad04 Mon Sep 17 00:00:00 2001 From: mattsanta Date: Mon, 26 Feb 2024 16:17:50 +0000 Subject: [PATCH 2/3] Add base url override for Cloud Deploy Custom Target Type IAM policy --- mmv1/products/clouddeploy/CustomTargetType.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/mmv1/products/clouddeploy/CustomTargetType.yaml b/mmv1/products/clouddeploy/CustomTargetType.yaml index eeda865485d..44edfc5fb23 100644 --- a/mmv1/products/clouddeploy/CustomTargetType.yaml +++ b/mmv1/products/clouddeploy/CustomTargetType.yaml @@ -51,6 +51,7 @@ import_format: iam_policy: !ruby/object:Api::Resource::IamPolicy parent_resource_attribute: 'name' method_name_separator: ':' + base_url: 'projects/{{project}}/locations/{{location}}/customTargetTypes/{{name}}' import_format: [ 'projects/{{project}}/locations/{{location}}/customTargetTypes/{{name}}' ] From 21eccad316ef3e999872470a285c8a713bf26653 Mon Sep 17 00:00:00 2001 From: mattsanta Date: Mon, 26 Feb 2024 21:57:06 +0000 Subject: [PATCH 3/3] Update import format for IAM policy and primary resource name to examples for IAM generated tests --- mmv1/products/clouddeploy/CustomTargetType.yaml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/mmv1/products/clouddeploy/CustomTargetType.yaml b/mmv1/products/clouddeploy/CustomTargetType.yaml index 44edfc5fb23..49820c07a12 100644 --- a/mmv1/products/clouddeploy/CustomTargetType.yaml +++ b/mmv1/products/clouddeploy/CustomTargetType.yaml @@ -52,23 +52,24 @@ iam_policy: !ruby/object:Api::Resource::IamPolicy parent_resource_attribute: 'name' method_name_separator: ':' base_url: 'projects/{{project}}/locations/{{location}}/customTargetTypes/{{name}}' - import_format: [ - 'projects/{{project}}/locations/{{location}}/customTargetTypes/{{name}}' - ] + import_format: ['projects/{{project}}/locations/{{location}}/customTargetTypes/{{name}}', '{{name}}'] examples: - !ruby/object:Provider::Terraform::Examples name: "clouddeploy_custom_target_type_basic" primary_resource_id: "custom-target-type" + primary_resource_name: 'fmt.Sprintf("tf-test-my-custom-target-type%s", context["random_suffix"])' vars: custom_target_type_name: "my-custom-target-type" - !ruby/object:Provider::Terraform::Examples name: "clouddeploy_custom_target_type_git_skaffold_modules" primary_resource_id: "custom-target-type" + primary_resource_name: 'fmt.Sprintf("tf-test-my-custom-target-type%s", context["random_suffix"])' vars: custom_target_type_name: "my-custom-target-type" - !ruby/object:Provider::Terraform::Examples name: "clouddeploy_custom_target_type_gcs_skaffold_modules" primary_resource_id: "custom-target-type" + primary_resource_name: 'fmt.Sprintf("tf-test-my-custom-target-type%s", context["random_suffix"])' vars: custom_target_type_name: "my-custom-target-type" parameters: