Skip to content

Commit f1cef39

Browse files
authored
[keyvault] update build.go files (#25200)
1 parent 02dfb45 commit f1cef39

File tree

11 files changed

+87
-87
lines changed

11 files changed

+87
-87
lines changed
Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
//go:generate go run ./testdata/generate/transforms.go
2+
//go:generate goimports -w .
3+
4+
// Copyright (c) Microsoft Corporation. All rights reserved.
5+
// Licensed under the MIT License. See License.txt in the project root for license information.
6+
7+
package backup
Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
// Copyright (c) Microsoft Corporation. All rights reserved.
2+
// Licensed under the MIT License. See License.txt in the project root for license information.
3+
4+
package main
5+
6+
import (
7+
"log"
8+
"os"
9+
"regexp"
10+
)
11+
12+
// removing client prefix from types
13+
func regexReplace(fileName string, regex string, replace string) {
14+
file, err := os.ReadFile(fileName)
15+
if err != nil {
16+
log.Fatal(err)
17+
}
18+
19+
r := regexp.MustCompile(regex)
20+
file = r.ReplaceAll(file, []byte(replace))
21+
22+
err = os.WriteFile(fileName, file, 0644)
23+
if err != nil {
24+
log.Fatal(err)
25+
}
26+
}
27+
28+
func main() {
29+
// modify Restore to use implementation with custom poller handler
30+
regexReplace("client.go", `\[PreFullRestoreResponse\], error\) \{\s(?:.+\s)+\}`, "[PreFullRestoreResponse], error) {return client.beginPreFullRestore(ctx, preRestoreOperationParameters, options)}")
31+
regexReplace("client.go", `\[FullRestoreResponse\], error\) \{\s(?:.+\s)+\}`, "[FullRestoreResponse], error) {return client.beginFullRestore(ctx, restoreBlobDetails, options)}")
32+
regexReplace("client.go", `\[SelectiveKeyRestoreResponse\], error\) \{\s(?:.+\s)+\}`, "[SelectiveKeyRestoreResponse], error) {return client.beginSelectiveKeyRestore(ctx, keyName, restoreBlobDetails, options)}")
33+
34+
// replace Error with ErrorInfo
35+
regexReplace("models.go", `Error \*string`, "Error *ErrorInfo")
36+
}

sdk/security/keyvault/azadmin/internal/generate/transforms.go

Lines changed: 0 additions & 59 deletions
This file was deleted.
Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
//go:generate go run ./testdata/generate/transforms.go
2+
//go:generate goimports -w .
3+
4+
// Copyright (c) Microsoft Corporation. All rights reserved.
5+
// Licensed under the MIT License. See License.txt in the project root for license information.
6+
7+
package rbac
Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
// Copyright (c) Microsoft Corporation. All rights reserved.
2+
// Licensed under the MIT License. See License.txt in the project root for license information.
3+
4+
package main
5+
6+
import (
7+
"log"
8+
"os"
9+
"regexp"
10+
)
11+
12+
// removing client prefix from types
13+
func regexReplace(fileName string, regex string, replace string) {
14+
file, err := os.ReadFile(fileName)
15+
if err != nil {
16+
log.Fatal(err)
17+
}
18+
19+
r := regexp.MustCompile(regex)
20+
file = r.ReplaceAll(file, []byte(replace))
21+
22+
err = os.WriteFile(fileName, file, 0644)
23+
if err != nil {
24+
log.Fatal(err)
25+
}
26+
}
27+
28+
func main() {
29+
// fix up the scope parameter for fakes
30+
regexReplace("fake/server.go", `\, scopeParam\,`, ", rbac.RoleScope(`/`+scopeParam),")
31+
regexReplace("fake/server.go", `\(scopeParam\, `, "(rbac.RoleScope(`/`+scopeParam), ")
32+
regexReplace("fake/server.go", `(\(\?P<scope\>(.*?)\))`, `?$1?`)
33+
}

sdk/security/keyvault/azcertificates/build.go

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
//go:generate tsp-client update
2-
//go:generate go run internal/transforms.go
1+
//go:generate go run testdata/generate/transforms.go
32
//go:generate goimports -w .
43

54
// Copyright (c) Microsoft Corporation. All rights reserved.

sdk/security/keyvault/azcertificates/internal/transforms.go renamed to sdk/security/keyvault/azcertificates/testdata/generate/transforms.go

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -35,16 +35,8 @@ func main() {
3535
regexReplace("models.go", `\sKID \*string(\s+.*)`, "KID *ID$1")
3636
regexReplace("models.go", `\sSID \*string(\s+.*)`, "SID *ID$1")
3737

38-
// remove the DeletionRecoveryLevel type
39-
regexReplace("models.go", "DeletionRecoveryLevel", "string")
40-
regexReplace("constants.go", `(?:\/\/.*\s)+type DeletionRecoveryLevel string`, "")
41-
regexReplace("constants.go", `(?:\/\/.*\s)+func PossibleDeletionRecovery(?:.+\s)+\}`, "")
42-
regexReplace("constants.go", `const \(\n\/\/ DeletionRecoveryLevel(?:.+\s)+\)`, "")
43-
4438
// replace Error with ErrorInfo
45-
regexReplace("models.go", `Error \*KeyVaultErrorError`, `Error *ErrorInfo`)
46-
regexReplace("models.go", `type KeyVaultErrorError struct.+\{(?:\s.+\s)+\}`, "")
47-
regexReplace("models_serde.go", `(?:\/\/.*\s)+func \(\w \*?KeyVaultErrorError\).*\{\s(?:.+\s)+\}\s`, "")
39+
regexReplace("models.go", `Error \*string`, `Error *ErrorInfo`)
4840

4941
// clean up doc comments
5042
regexReplace("models.go", `For valid values\, see JsonWebKeyCurveName\.`, "")

sdk/security/keyvault/azkeys/build.go

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
//go:generate tsp-client update
2-
//go:generate go run ./internal/transforms.go
1+
//go:generate go run ./testdata/generate/transforms.go
32
//go:generate goimports -w .
43

54
// Copyright (c) Microsoft Corporation. All rights reserved.

sdk/security/keyvault/azkeys/internal/transforms.go renamed to sdk/security/keyvault/azkeys/testdata/generate/transforms.go

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -33,21 +33,12 @@ func main() {
3333
// make secret IDs a convenience type so we can add parsing methods
3434
regexReplace("models.go", `\sKID \*string(\s+.*)`, "KID *ID$1")
3535

36-
// change type of KeyOps to KeyOperation
37-
regexReplace("models.go", `KeyOps \[\]\*string`, `KeyOps []*KeyOperation`)
38-
3936
// delete SignatureAlgorithmRSNULL
4037
regexReplace("constants.go", `.*(\bSignatureAlgorithmRSNULL\b).*`, "")
4138

4239
// delete KeyOperationExport
4340
regexReplace("constants.go", `.*(\bKeyOperationExport\b).*`, "")
4441

45-
// delete DeletionRecoveryLevel
46-
regexReplace("models.go", `RecoveryLevel \*DeletionRecoveryLevel`, "RecoveryLevel *string")
47-
regexReplace("constants.go", `(?:\/\/.*\s)+type DeletionRecoveryLevel string`, "")
48-
regexReplace("constants.go", `(?:\/\/.*\s)+func PossibleDeletionRecovery(?:.+\s)+\}`, "")
49-
regexReplace("constants.go", `const \(\n\/\/ DeletionRecoveryLevel(?:.+\s)+\)`, "")
50-
5142
// fix up doc comments
5243
regexReplace("models.go", `DeletedKeyBundle`, `DeletedKey`)
5344
regexReplace("responses.go", `DeletedKeyBundle`, `DeletedKey`)

sdk/security/keyvault/azsecrets/build.go

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,4 @@
1-
//go:generate tsp-client update
2-
//go:generate go run ./internal/transforms.go
3-
//go:generate rm ./constants.go
1+
//go:generate go run ./testdata/generate/transforms.go
42
//go:generate goimports -w .
53

64
// Copyright (c) Microsoft Corporation. All rights reserved.

0 commit comments

Comments
 (0)