Skip to content

Commit 322d783

Browse files
authored
fix publishing to hashrelease VM (#10636)
1 parent 8552577 commit 322d783

File tree

1 file changed

+12
-6
lines changed

1 file changed

+12
-6
lines changed

release/internal/hashreleaseserver/server.go

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -92,10 +92,9 @@ func (h *Hashrelease) URL() string {
9292
//
9393
// 3. It sets it as the latest for its product stream if specified.
9494
func Publish(productCode string, h *Hashrelease, cfg *Config) error {
95-
srcDir := strings.TrimSuffix(h.Source, "/") + "/"
9695
logrus.WithFields(logrus.Fields{
9796
"hashrelease": h.Name,
98-
"srcDir": srcDir,
97+
"srcDir": h.Source,
9998
"latest": h.Latest,
10099
}).Info("Publishing hashrelease")
101100

@@ -124,14 +123,18 @@ func publishFiles(h *Hashrelease, cfg *Config) error {
124123
logrus.WithFields(logrus.Fields{
125124
"hashrelease": h.Name,
126125
"srcDir": h.Source,
127-
}).Info("Publishing hashrelease")
126+
}).Info("Publishing hashrelease files")
128127
var allErr error
129128
// publish to the server via SSH
130-
logrus.WithField("hashrelease", h.Name).Debug("Publishing hashrelease via SSH")
129+
srcDir := strings.TrimSuffix(h.Source, "/") + "/"
130+
logrus.WithFields(logrus.Fields{
131+
"hashrelease": h.Name,
132+
"srcDir": srcDir,
133+
}).Debug("Publishing hashrelease via SSH")
131134
if _, err := command.Run("rsync",
132135
[]string{
133136
"--stats", "-az", "--delete",
134-
fmt.Sprintf("--rsh=%s", cfg.RSHCommand()), h.Source,
137+
fmt.Sprintf("--rsh=%s", cfg.RSHCommand()), srcDir,
135138
fmt.Sprintf("%s:%s/%s", cfg.HostString(), RemoteDocsPath(cfg.User), h.Name),
136139
}); err != nil {
137140
logrus.WithError(err).Error("Failed to publish hashrelease via SSH")
@@ -143,7 +146,10 @@ func publishFiles(h *Hashrelease, cfg *Config) error {
143146
logrus.WithError(err).Error("Failed to get credentials email for hashrelease server")
144147
return errors.Join(allErr, fmt.Errorf("failed to get credentials email for hashrelease server: %w", err))
145148
}
146-
logrus.WithField("hashrelease", h.Name).Debug("Publishing hashrelease to cloud storage")
149+
logrus.WithFields(logrus.Fields{
150+
"hashrelease": h.Name,
151+
"srcDir": h.Source,
152+
}).Debug("Publishing hashrelease to cloud storage")
147153
args := []string{
148154
"storage", "rsync",
149155
h.Source, fmt.Sprintf("gs://%s/%s", cfg.BucketName, h.Name),

0 commit comments

Comments
 (0)