Skip to content

Commit e36a73f

Browse files
authored
fix(devtools/cmd/migrate-sidekick): parse commit SHA and checksum from .sidekick.toml (#3211)
Parse discovery and googleapis commit SHA and checksum from `.sidekick.toml` Fixes #3121
1 parent 32d69d9 commit e36a73f

File tree

3 files changed

+25
-7
lines changed

3 files changed

+25
-7
lines changed

devtools/cmd/migrate-sidekick/main.go

Lines changed: 15 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,10 @@ import (
3333
)
3434

3535
const (
36-
sidekickFile = ".sidekick.toml"
36+
sidekickFile = ".sidekick.toml"
37+
discoveryArchivePrefix = "https://github.com/googleapis/discovery-artifact-manager/archive/"
38+
googleapisArchivePrefix = "https://github.com/googleapis/googleapis/archive/"
39+
tarballSuffix = ".tar.gz"
3740
)
3841

3942
var (
@@ -142,8 +145,13 @@ func readRootSidekick(repoPath string) (*config.Config, error) {
142145

143146
releaseLevel, _ := sidekick.Codec["release-level"].(string)
144147
warnings, _ := sidekick.Codec["disabled-rustdoc-warnings"].(string)
145-
googleapisCommitSHA, _ := sidekick.Source["googleapis-sha256"].(string)
146-
discoveryCommitSHA, _ := sidekick.Source["discovery-sha256"].(string)
148+
discoverySHA256, _ := sidekick.Source["discovery-sha256"].(string)
149+
discoveryRoot, _ := sidekick.Source["discovery-root"].(string)
150+
googleapisSHA256, _ := sidekick.Source["googleapis-sha256"].(string)
151+
googleapisRoot, _ := sidekick.Source["googleapis-root"].(string)
152+
153+
discoveryCommit := strings.TrimSuffix(strings.TrimPrefix(discoveryRoot, discoveryArchivePrefix), tarballSuffix)
154+
googleapisCommit := strings.TrimSuffix(strings.TrimPrefix(googleapisRoot, googleapisArchivePrefix), tarballSuffix)
147155

148156
// Parse package dependencies
149157
packageDependencies := parsePackageDependencies(sidekick.Codec)
@@ -152,10 +160,12 @@ func readRootSidekick(repoPath string) (*config.Config, error) {
152160
Language: "rust",
153161
Sources: &config.Sources{
154162
Discovery: &config.Source{
155-
Commit: discoveryCommitSHA,
163+
Commit: discoveryCommit,
164+
SHA256: discoverySHA256,
156165
},
157166
Googleapis: &config.Source{
158-
Commit: googleapisCommitSHA,
167+
Commit: googleapisCommit,
168+
SHA256: googleapisSHA256,
159169
},
160170
},
161171
Default: &config.Default{

devtools/cmd/migrate-sidekick/main_test.go

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,14 @@ func TestReadRootSidekick(t *testing.T) {
3636
want: &config.Config{
3737
Language: "rust",
3838
Sources: &config.Sources{
39-
Discovery: &config.Source{Commit: "67c8d3792f0ebf5f0582dce675c379d0f486604eb0143814c79e788954aa1212"},
40-
Googleapis: &config.Source{Commit: "839e897c39cada559b97d64f90378715a4a43fbc972d8cf93296db4156662085"},
39+
Discovery: &config.Source{
40+
Commit: "0bb1100f52bf0bae06f4b4d76742e7eba5c59793",
41+
SHA256: "67c8d3792f0ebf5f0582dce675c379d0f486604eb0143814c79e788954aa1212",
42+
},
43+
Googleapis: &config.Source{
44+
Commit: "fe58211356a91f4140ed51893703910db05ade91",
45+
SHA256: "839e897c39cada559b97d64f90378715a4a43fbc972d8cf93296db4156662085",
46+
},
4147
},
4248
Default: &config.Default{
4349
Output: "src/generated/",

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
[source]
2+
googleapis-root = 'https://github.com/googleapis/googleapis/archive/fe58211356a91f4140ed51893703910db05ade91.tar.gz'
23
googleapis-sha256 = '839e897c39cada559b97d64f90378715a4a43fbc972d8cf93296db4156662085'
4+
discovery-root = 'https://github.com/googleapis/discovery-artifact-manager/archive/0bb1100f52bf0bae06f4b4d76742e7eba5c59793.tar.gz'
35
discovery-sha256 = '67c8d3792f0ebf5f0582dce675c379d0f486604eb0143814c79e788954aa1212'
46

57
[codec]

0 commit comments

Comments
 (0)