-
Notifications
You must be signed in to change notification settings - Fork 240
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #3167 from jingyih/bqcc
mock: fix service account ID in connection mock
- Loading branch information
Showing
4 changed files
with
27 additions
and
20 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -92,11 +92,11 @@ func (s *ConnectionV1) CreateConnection(ctx context.Context, req *pb.CreateConne | |
| for i := range b { | ||
| b[i] = letterRunes[rand.Intn(len(letterRunes))] | ||
| } | ||
| return fmt.Sprintf("bqcx-%s-%[email protected]", req.GetParent(), string(b)) | ||
| return fmt.Sprintf("bqcx-%s-%[email protected]", strconv.FormatInt(name.Project.Number, 10), string(b)) | ||
| } | ||
|
|
||
| buildPrimaryServiceAccountId := func() string { | ||
| return fmt.Sprintf("service-%[email protected]", req.GetParent()) | ||
| return fmt.Sprintf("service-%[email protected]", strconv.FormatInt(name.Project.Number, 10)) | ||
| } | ||
|
|
||
| buildGoogleIdentity := func() string { | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -732,6 +732,13 @@ func normalizeHTTPResponses(t *testing.T, events test.LogEntries) { | |
| visitor.ReplacePath(".settings.settingsVersion", "123") | ||
| } | ||
|
|
||
| // BigQueryConnection | ||
| { | ||
| visitor.ReplacePath(".cloudResource.serviceAccountId", "bqcx-${projectNumber}[email protected]") | ||
| visitor.ReplacePath(".creationTime", "123456789") | ||
| visitor.ReplacePath(".lastModifiedTime", "123456789") | ||
| } | ||
|
|
||
| // Run visitors | ||
| events.PrettifyJSON(func(obj map[string]any) { | ||
| if err := visitor.visitMap(obj, ""); err != nil { | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters