Skip to content

Commit

Permalink
Addressing comments from Marius
Browse files Browse the repository at this point in the history
  • Loading branch information
edcdavid committed Jul 31, 2024
1 parent 7014492 commit 7a60fc2
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 10 deletions.
16 changes: 8 additions & 8 deletions tests/system-tests/diskencryption/internal/config/config.go
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,11 @@ import (
)

const (
// PathToDefaultDiskEncryptionParamsFile path to config file with default ipsec parameters.
// PathToDefaultDiskEncryptionParamsFile path to config file with default disk encryption parameters.
PathToDefaultDiskEncryptionParamsFile = "./default.yaml"
)

// DiskEncrptionConfig type keeps ipsec configuration.
// DiskEncrptionConfig type keeps disk encryption configuration.
type DiskEncrptionConfig struct {
*systemtestsconfig.SystemTestsConfig
// BMCClient provides access to the BMC. Nil when BMC configs are not provided.
Expand All @@ -31,9 +31,9 @@ type DiskEncrptionConfig struct {
BMCTimeout time.Duration `yaml:"BMCTimeout" envconfig:"ECO_SYSTEM_TESTS_BMC_TIMEOUT"`
}

// NewDiskEncryptionConfig returns instance of IpsecConfig config type.
// NewDiskEncryptionConfig returns instance of DiskEncrptionConfig config type.
func NewDiskEncryptionConfig() *DiskEncrptionConfig {
log.Print("Creating new IpsecConfig struct")
log.Print("Creating new DiskEncrptionConfig struct")

var diskEncryptionConf DiskEncrptionConfig

Expand Down Expand Up @@ -75,7 +75,7 @@ func NewDiskEncryptionConfig() *DiskEncrptionConfig {
return &diskEncryptionConf
}

func readFile(ipsecConfig *DiskEncrptionConfig, cfgFile string) error {
func readFile(diskEncrptionConfig *DiskEncrptionConfig, cfgFile string) error {
openedCfgFile, err := os.Open(cfgFile)
if err != nil {
return err
Expand All @@ -86,7 +86,7 @@ func readFile(ipsecConfig *DiskEncrptionConfig, cfgFile string) error {
}()

decoder := yaml.NewDecoder(openedCfgFile)
err = decoder.Decode(&ipsecConfig)
err = decoder.Decode(&diskEncrptionConfig)

if err != nil {
return err
Expand All @@ -95,8 +95,8 @@ func readFile(ipsecConfig *DiskEncrptionConfig, cfgFile string) error {
return nil
}

func readEnv(ipsecConfig *DiskEncrptionConfig) error {
err := envconfig.Process("", ipsecConfig)
func readEnv(diskEncrptionConfig *DiskEncrptionConfig) error {
err := envconfig.Process("", diskEncrptionConfig)
if err != nil {
return err
}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package ipsecinittools
package diskencryptioninittools

import (
"github.com/golang/glog"
Expand Down
2 changes: 1 addition & 1 deletion tests/system-tests/diskencryption/tests/tpm2.go
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,9 @@ import (
. "github.com/onsi/gomega"
"github.com/openshift-kni/eco-goinfra/pkg/nodes"
"github.com/openshift-kni/eco-gotests/tests/internal/cluster"
. "github.com/openshift-kni/eco-gotests/tests/system-tests/diskencryption/internal/diskencryptioninittools"
"github.com/openshift-kni/eco-gotests/tests/system-tests/diskencryption/internal/file"
"github.com/openshift-kni/eco-gotests/tests/system-tests/diskencryption/internal/helper"

Check failure on line 16 in tests/system-tests/diskencryption/tests/tpm2.go

View workflow job for this annotation

GitHub Actions / build

could not import github.com/openshift-kni/eco-gotests/tests/system-tests/diskencryption/internal/helper (-: # github.com/openshift-kni/eco-gotests/tests/system-tests/diskencryption/internal/helper
. "github.com/openshift-kni/eco-gotests/tests/system-tests/diskencryption/internal/inittools"
"github.com/openshift-kni/eco-gotests/tests/system-tests/diskencryption/internal/parsehelper"
stdinmatcher "github.com/openshift-kni/eco-gotests/tests/system-tests/diskencryption/internal/stdin-matcher"
"github.com/openshift-kni/eco-gotests/tests/system-tests/diskencryption/tsparams"
Expand Down

0 comments on commit 7a60fc2

Please sign in to comment.