Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Release support improvements #908

Merged
merged 2 commits into from
Jan 25, 2024
Merged

Release support improvements #908

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ef1cbf9
Make dos2unix available.
joel-rieke Jan 25, 2024
7afe778
Adding some additional logging.
joel-rieke Jan 25, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ...cloud/terraform/azure/cloudboot/trc_templates/Vault/Tierceron/scripts/install.sh.tpl.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

# Install packages
sudo apt-get update -y
sudo apt-get install -y curl unzip
sudo apt-get install -y curl unzip dos2unix
sudo apt-get install -y coreutils
sudo apt-get install -y docker.io
sudo apt-get install -y openjdk-11-jre-headless
Expand Down
8 changes: 7 additions & 1 deletion pkg/utils/vaultUtil.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
package utils

import (
"errors"
"fmt"
"log"
"os"
Expand All @@ -15,14 +16,19 @@ import (
// Helper to easiliy intialize a vault and a mod all at once.
func InitVaultMod(config *DriverConfig) (*DriverConfig, *helperkv.Modifier, *sys.Vault, error) {
LogInfo(config, "InitVaultMod begins..")
if config == nil {
LogInfo(config, "InitVaultMod failure. config provided is nil")
return config, nil, nil, errors.New("invalid nil config")
}

vault, err := sys.NewVault(config.Insecure, config.VaultAddress, config.Env, false, false, false, config.Log)
if err != nil {
LogInfo(config, "Failure to connect to vault..")
LogErrorObject(config, err, false)
return config, nil, nil, err
}
vault.SetToken(config.Token)

LogInfo(config, "InitVaultMod - Initializing Modifier")
mod, err := helperkv.NewModifier(config.Insecure, config.Token, config.VaultAddress, config.Env, config.Regions, false, config.Log)
if err != nil {
LogErrorObject(config, err, false)
Expand Down
Loading