Skip to content

[Do Not Merge] sample tests - merge conflicts test 1 #16560

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
shuyama1 wants to merge 1 commit into
base: update_test_branch
Choose a base branch
from
+20 −0
Open

[Do Not Merge] sample tests - merge conflicts test 1 #16560

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
5 changes: 5 additions & 0 deletions mmv1/products/apihub/ApiHubInstance.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,11 @@ examples:
vars:
instance_id: test-instance-full
exclude_test: true
- name: apihub_api_hub_instance_full_merge_conflict_test
primary_resource_id: apihub-instance-search
vars:
instance_id: test-instance-full
exclude_test: true
autogen_async: true
exclude_delete: true
async:
Expand Down
15 changes: 15 additions & 0 deletions mmv1/templates/terraform/examples/apihub_api_hub_instance_full_merge_conflict_test.tf.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
resource "google_apihub_api_hub_instance" "{{$.PrimaryResourceId}}"{
project = "my-project"
api_hub_instance_id = "{{index $.Vars "instance_id"}}"
description = "Test API hub instance"
location = "us-central1"
config {
encryption_type = "CMEK"
cmek_key_name = "projects/my-project/locations/us-central1/keyRings/apihub/cryptoKeys/apihub-key"
disable_search = false
vertex_location = "us"
}
labels = {
environment = "dev"
}
}
Loading