Skip to content

Commit 874a8f4

Browse files
authored
chore(devtools/cmd/migrate-sidekick): add showcase, protobuf, conformance source (#3267)
Parse showcase, protobuf and conformace source root from `.sidekick.toml`. For #3200
1 parent 0671e6e commit 874a8f4

File tree

3 files changed

+51
-5
lines changed

3 files changed

+51
-5
lines changed

devtools/cmd/migrate-sidekick/main.go

Lines changed: 31 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -34,11 +34,14 @@ import (
3434
)
3535

3636
const (
37-
sidekickFile = ".sidekick.toml"
38-
cargoFile = "Cargo.toml"
39-
discoveryArchivePrefix = "https://github.com/googleapis/discovery-artifact-manager/archive/"
40-
googleapisArchivePrefix = "https://github.com/googleapis/googleapis/archive/"
41-
tarballSuffix = ".tar.gz"
37+
sidekickFile = ".sidekick.toml"
38+
cargoFile = "Cargo.toml"
39+
discoveryArchivePrefix = "https://github.com/googleapis/discovery-artifact-manager/archive/"
40+
googleapisArchivePrefix = "https://github.com/googleapis/googleapis/archive/"
41+
showcaseArchivePrefix = "https://github.com/googleapis/gapic-showcase/archive/"
42+
protobufArchivePrefix = "https://github.com/protocolbuffers/protobuf/archive/"
43+
conformanceArchivePrefix = "https://github.com/protocolbuffers/protobuf/archive/"
44+
tarballSuffix = ".tar.gz"
4245
)
4346

4447
var (
@@ -162,10 +165,20 @@ func readRootSidekick(repoPath string) (*config.Config, error) {
162165
discoveryRoot, _ := sidekick.Source["discovery-root"].(string)
163166
googleapisSHA256, _ := sidekick.Source["googleapis-sha256"].(string)
164167
googleapisRoot, _ := sidekick.Source["googleapis-root"].(string)
168+
showcaseRoot, _ := sidekick.Source["showcase-root"].(string)
169+
showcaseSHA256, _ := sidekick.Source["showcase-sha256"].(string)
170+
protobufRoot, _ := sidekick.Source["protobuf-src-root"].(string)
171+
protobufSHA256, _ := sidekick.Source["protobuf-src-sha256"].(string)
172+
protobufSubDir, _ := sidekick.Source["protobuf-src-subdir"].(string)
173+
conformanceRoot, _ := sidekick.Source["conformance-root"].(string)
174+
conformanceSHA256, _ := sidekick.Source["conformance-sha256"].(string)
165175
generateSetterSamples, _ := sidekick.Codec["generate-setter-samples"].(string)
166176

167177
discoveryCommit := strings.TrimSuffix(strings.TrimPrefix(discoveryRoot, discoveryArchivePrefix), tarballSuffix)
168178
googleapisCommit := strings.TrimSuffix(strings.TrimPrefix(googleapisRoot, googleapisArchivePrefix), tarballSuffix)
179+
showcaseCommit := strings.TrimSuffix(strings.TrimPrefix(showcaseRoot, showcaseArchivePrefix), tarballSuffix)
180+
protobufCommit := strings.TrimSuffix(strings.TrimPrefix(protobufRoot, protobufArchivePrefix), tarballSuffix)
181+
conformanceCommit := strings.TrimSuffix(strings.TrimPrefix(conformanceRoot, conformanceArchivePrefix), tarballSuffix)
169182

170183
// Parse package dependencies
171184
packageDependencies := parsePackageDependencies(sidekick.Codec)
@@ -181,6 +194,19 @@ func readRootSidekick(repoPath string) (*config.Config, error) {
181194
Commit: googleapisCommit,
182195
SHA256: googleapisSHA256,
183196
},
197+
Showcase: &config.Source{
198+
Commit: showcaseCommit,
199+
SHA256: showcaseSHA256,
200+
},
201+
ProtobufSrc: &config.Source{
202+
Commit: protobufCommit,
203+
SHA256: protobufSHA256,
204+
Subpath: protobufSubDir,
205+
},
206+
Conformance: &config.Source{
207+
Commit: conformanceCommit,
208+
SHA256: conformanceSHA256,
209+
},
184210
},
185211
Default: &config.Default{
186212
Output: "src/generated/",

devtools/cmd/migrate-sidekick/main_test.go

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,19 @@ func TestReadRootSidekick(t *testing.T) {
4444
Commit: "fe58211356a91f4140ed51893703910db05ade91",
4545
SHA256: "839e897c39cada559b97d64f90378715a4a43fbc972d8cf93296db4156662085",
4646
},
47+
Showcase: &config.Source{
48+
Commit: "69bdd62035d793f3d23a0c960dee547023c1c5ac",
49+
SHA256: "96491310ba1b5c0c71738d3d80327a95196c1b6ac16f033e3fa440870efbbf5c",
50+
},
51+
ProtobufSrc: &config.Source{
52+
Commit: "b407e8416e3893036aee5af9a12bd9b6a0e2b2e6",
53+
SHA256: "55912546338433f465a552e9ef09930c63b9eb697053937416890cff83a8622d",
54+
Subpath: "src",
55+
},
56+
Conformance: &config.Source{
57+
Commit: "b407e8416e3893036aee5af9a12bd9b6a0e2b2e6",
58+
SHA256: "55912546338433f465a552e9ef09930c63b9eb697053937416890cff83a8622d",
59+
},
4760
},
4861
Default: &config.Default{
4962
Output: "src/generated/",

devtools/cmd/migrate-sidekick/testdata/root-sidekick/success/.sidekick.toml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,15 @@
11
[source]
2+
showcase-root = 'https://github.com/googleapis/gapic-showcase/archive/69bdd62035d793f3d23a0c960dee547023c1c5ac.tar.gz'
3+
showcase-sha256 = '96491310ba1b5c0c71738d3d80327a95196c1b6ac16f033e3fa440870efbbf5c'
24
googleapis-root = 'https://github.com/googleapis/googleapis/archive/fe58211356a91f4140ed51893703910db05ade91.tar.gz'
35
googleapis-sha256 = '839e897c39cada559b97d64f90378715a4a43fbc972d8cf93296db4156662085'
46
discovery-root = 'https://github.com/googleapis/discovery-artifact-manager/archive/0bb1100f52bf0bae06f4b4d76742e7eba5c59793.tar.gz'
57
discovery-sha256 = '67c8d3792f0ebf5f0582dce675c379d0f486604eb0143814c79e788954aa1212'
8+
protobuf-src-root = 'https://github.com/protocolbuffers/protobuf/archive/b407e8416e3893036aee5af9a12bd9b6a0e2b2e6.tar.gz'
9+
protobuf-src-sha256 = '55912546338433f465a552e9ef09930c63b9eb697053937416890cff83a8622d'
10+
protobuf-src-subdir = 'src'
11+
conformance-root = 'https://github.com/protocolbuffers/protobuf/archive/b407e8416e3893036aee5af9a12bd9b6a0e2b2e6.tar.gz'
12+
conformance-sha256 = '55912546338433f465a552e9ef09930c63b9eb697053937416890cff83a8622d'
613

714
[codec]
815
# The default version for all crates. This can be overridden in the crate's

0 commit comments

Comments
 (0)