Skip to content

Commit 695ac92

Browse files
authored
Fixed repository group sweeper to fix test failures (#15620)
1 parent 826c700 commit 695ac92

File tree

3 files changed

+8
-2
lines changed

3 files changed

+8
-2
lines changed

mmv1/products/gemini/CodeRepositoryIndex.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ base_url: projects/{{project}}/locations/{{location}}/codeRepositoryIndexes
2222
self_link: projects/{{project}}/locations/{{location}}/codeRepositoryIndexes/{{code_repository_index_id}}
2323
create_url: projects/{{project}}/locations/{{location}}/codeRepositoryIndexes?codeRepositoryIndexId={{code_repository_index_id}}
2424
delete_url: projects/{{project}}/locations/{{location}}/codeRepositoryIndexes/{{code_repository_index_id}}?force={{force_destroy}}
25+
collection_url_key: 'codeRepositoryIndexes'
2526
update_verb: 'PATCH'
2627
update_mask: true
2728
id_format: projects/{{project}}/locations/{{location}}/codeRepositoryIndexes/{{code_repository_index_id}}

mmv1/products/gemini/RepositoryGroup.yaml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,12 @@ iam_policy:
6767
error_retry_predicates:
6868
- 'transport_tpg.IsCodeRepositoryIndexUnreadyError'
6969
- 'transport_tpg.IsRepositoryGroupQueueError'
70+
sweeper:
71+
parent:
72+
resource_type: 'google_gemini_code_repository_index'
73+
child_field: 'code_repository_index'
74+
parent_field: 'name'
75+
parent_field_extract_name: true
7076
parameters:
7177
- name: location
7278
type: String

mmv1/third_party/terraform/sweeper/hashi_sweeper_fork.go

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ import (
44
"flag"
55
"fmt"
66
"log"
7-
"os"
87
"strings"
98
"testing"
109

@@ -115,7 +114,7 @@ func ExecuteSweepers(t *testing.T) {
115114
sweepers := filterSweepers(*flagSweepRun, sweeperInventory)
116115

117116
if err := runSweepers(t, regions, sweepers, *flagSweepAllowFailures); err != nil {
118-
os.Exit(1)
117+
t.Errorf("error running sweepers: %v", err)
119118
}
120119
} else {
121120
t.Skip("skipping sweeper run. No region supplied")

0 commit comments

Comments
 (0)