Skip to content

Commit a4f872f

Browse files
committed
blindly passthrough encryption config
1 parent 78e5ad6 commit a4f872f

File tree

3 files changed

+2
-373
lines changed

3 files changed

+2
-373
lines changed

internal/remotestate/config.go

Lines changed: 2 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -61,34 +61,16 @@ func (cfg *Config) GenerateOpenTofuCode(l log.Logger, opts *options.TerragruntOp
6161
return errors.New(ErrGenerateCalledWithNoGenerateAttr)
6262
}
6363

64-
// Init the encryption config based on the key provider
65-
var encryption map[string]any
66-
6764
switch {
6865
case cfg.Encryption == nil:
6966
l.Debug("No encryption block in remote_state config")
7067
case len(cfg.Encryption) == 0:
7168
l.Debug("Empty encryption block in remote_state config")
7269
default:
73-
keyProvider, ok := cfg.Encryption[codegen.EncryptionKeyProviderKey].(string)
70+
_, ok := cfg.Encryption[codegen.EncryptionKeyProviderKey].(string)
7471
if !ok {
7572
return errors.New("key_provider not found in encryption config")
7673
}
77-
78-
encryptionProvider, err := NewRemoteEncryptionKeyProvider(keyProvider)
79-
if err != nil {
80-
return errors.Errorf("error creating provider: %w", err)
81-
}
82-
83-
err = encryptionProvider.UnmarshalConfig(cfg.Encryption)
84-
if err != nil {
85-
return err
86-
}
87-
88-
encryption, err = encryptionProvider.ToMap()
89-
if err != nil {
90-
return errors.Errorf("error decoding struct to map: %w", err)
91-
}
9274
}
9375

9476
// Convert the IfExists setting to the internal enum representation before calling generate.
@@ -97,7 +79,7 @@ func (cfg *Config) GenerateOpenTofuCode(l log.Logger, opts *options.TerragruntOp
9779
return err
9880
}
9981

100-
configBytes, err := codegen.RemoteStateConfigToTerraformCode(cfg.BackendName, backendConfig, encryption)
82+
configBytes, err := codegen.RemoteStateConfigToTerraformCode(cfg.BackendName, backendConfig, cfg.Encryption)
10183
if err != nil {
10284
return err
10385
}

internal/remotestate/remote_encryption.go

Lines changed: 0 additions & 109 deletions
This file was deleted.

internal/remotestate/remote_encryption_test.go

Lines changed: 0 additions & 244 deletions
This file was deleted.

0 commit comments

Comments
 (0)