OCI Vault fix (#131)

* OCI Vault fix

Author: andytael

README.md

@@ -662,10 +662,10 @@ The following example puts the logfile in the current location with the filename
 
 The exporter will read the password from a secret stored in OCI Vault if you set these two environment variables:
 
-- `VAULT_ID` should be set to the OCID of the OCI vault that you wish to use
-- `VAULT_SECRET_NAME` should be set to the name of the secret in the OCI vault which contains the database password
+- `OCI_VAULT_ID` should be set to the OCID of the OCI vault that you wish to use
+- `OCI_VAULT_SECRET_NAME` should be set to the name of the secret in the OCI vault which contains the database password
 
-Note that the process must be running under a user that has the OCI CLI installed and configured correctly to access the desired tenancy and region.
+> Note that the process must be running under a user that has the OCI CLI installed and configured correctly to access the desired tenancy and region. The OCI Profile used is `DEFAULT`.
 
 ## Custom metrics
 

main.go

@@ -60,10 +60,10 @@ func main() {
 	connectString := os.Getenv("DB_CONNECT_STRING")
 	dbrole := os.Getenv("DB_ROLE")
 
-	vaultName, useVault := os.LookupEnv("VAULT_ID")
+	vaultID, useVault := os.LookupEnv("OCI_VAULT_ID")
 	if useVault {
-		level.Info(logger).Log("msg", "VAULT_ID env var is present so using OCI Vault", "vault_name", vaultName)
-		password = vault.GetVaultSecret(vaultName, os.Getenv("VAULT_SECRET_NAME"))
+		level.Info(logger).Log("msg", "OCI_VAULT_ID env var is present so using OCI Vault", "vaultOCID", vaultID)
+		password = vault.GetVaultSecret(vaultID, os.Getenv("OCI_VAULT_SECRET_NAME"))
 	}
 
 	freeOSMemInterval, enableFree := os.LookupEnv("FREE_INTERVAL")

vault/vault.go

@@ -8,17 +8,27 @@ import (
 	b64 "encoding/base64"
 	"strings"
 
+	"github.com/go-kit/log/level"
 	"github.com/oracle/oci-go-sdk/v65/common"
 	"github.com/oracle/oci-go-sdk/v65/example/helpers"
 	"github.com/oracle/oci-go-sdk/v65/secrets"
+	"github.com/prometheus/common/promlog"
 )
 
 func GetVaultSecret(vaultId string, secretName string) string {
-	configProvider := common.ConfigurationProviderEnvironmentVariables("vault", "")
+	promLogConfig := &promlog.Config{}
+	logger := promlog.New(promLogConfig)
 
-	client, err := secrets.NewSecretsClientWithConfigurationProvider(configProvider)
+	client, err := secrets.NewSecretsClientWithConfigurationProvider(common.DefaultConfigProvider())
 	helpers.FatalIfError(err)
 
+	tenancyID, err := common.DefaultConfigProvider().TenancyOCID()
+	helpers.FatalIfError(err)
+	region, err := common.DefaultConfigProvider().Region()
+	helpers.FatalIfError(err)
+	level.Info(logger).Log("msg", "OCI_VAULT_ID env var is present so using OCI Vault", "Region", region)
+	level.Info(logger).Log("msg", "OCI_VAULT_ID env var is present so using OCI Vault", "tenancyOCID", tenancyID)
+
 	req := secrets.GetSecretBundleByNameRequest{
 		SecretName: common.String(secretName),
 		VaultId:    common.String(vaultId)}