Skip to content

Commit fd09291

Browse files
committed
fix(deploy): inconsistent data, unpad failed error in bundle apply/render
Fix error `Error: pull bundle: error decoding secrets: error loading secret files data: error decoding secret/secret-config.txt: decryption failed: check encryption key and data: inconsistent data, unpad failed` Signed-off-by: Ilya Lesikov <ilya@lesikov.com>
1 parent 6bed7df commit fd09291

File tree

2 files changed

+14
-0
lines changed

2 files changed

+14
-0
lines changed

cmd/werf/bundle/apply/apply.go

+7
Original file line numberDiff line numberDiff line change
@@ -195,6 +195,12 @@ func runApply(ctx context.Context) error {
195195
return fmt.Errorf("get service values: %w", err)
196196
}
197197

198+
secretWorkDir, err := os.Getwd()
199+
if err != nil {
200+
return fmt.Errorf("get current working directory: %w", err)
201+
}
202+
secrets.SecretsWorkingDir = secretWorkDir
203+
198204
if err := bundles.Pull(ctx, fmt.Sprintf("%s:%s", repoAddress, cmdData.Tag), bundlePath, bundlesRegistryClient); err != nil {
199205
return fmt.Errorf("pull bundle: %w", err)
200206
}
@@ -246,6 +252,7 @@ func runApply(ctx context.Context) error {
246252
RollbackGraphSave: common.GetRollbackGraphPath(&commonCmdData) != "",
247253
SecretKeyIgnore: *commonCmdData.IgnoreSecretKey,
248254
SecretValuesPaths: common.GetSecretValues(&commonCmdData),
255+
SecretWorkDir: secretWorkDir,
249256
SubNotes: *commonCmdData.RenderSubchartNotes,
250257
TrackCreationTimeout: time.Duration(cmdData.Timeout) * time.Second,
251258
TrackDeletionTimeout: time.Duration(cmdData.Timeout) * time.Second,

cmd/werf/bundle/render/render.go

+7
Original file line numberDiff line numberDiff line change
@@ -177,6 +177,12 @@ func runRender(ctx context.Context) error {
177177
return fmt.Errorf("get service values: %w", err)
178178
}
179179

180+
secretWorkDir, err := os.Getwd()
181+
if err != nil {
182+
return fmt.Errorf("get current working directory: %w", err)
183+
}
184+
secrets.SecretsWorkingDir = secretWorkDir
185+
180186
var bundlePath string
181187
if isLocalBundle {
182188
bundlePath = cmdData.BundleDir
@@ -239,6 +245,7 @@ func runRender(ctx context.Context) error {
239245
ReleaseStorageDriver: action.ReleaseStorageDriver(os.Getenv("HELM_DRIVER")),
240246
SecretKeyIgnore: *commonCmdData.IgnoreSecretKey,
241247
SecretValuesPaths: common.GetSecretValues(&commonCmdData),
248+
SecretWorkDir: secretWorkDir,
242249
ShowCRDs: cmdData.IncludeCRDs,
243250
ShowOnlyFiles: append(util.PredefinedValuesByEnvNamePrefix("WERF_SHOW_ONLY"), cmdData.ShowOnly...),
244251
ValuesFileSets: common.GetSetFile(&commonCmdData),

0 commit comments

Comments
 (0)