fix(sonic): rename vault secret store func call (#81)

Author: xenirio

.drone.yml

@@ -3,11 +3,35 @@ kind: pipeline
 type: docker
 name: default
 
+services:
+  - name: vault
+    image: vault:1.5.3
+    ports:
+      - 8200
+    environment:
+      VAULT_DEV_ROOT_TOKEN_ID: "changeme"
+
 steps:
+  - name: Wait for services
+    image: jwilder/dockerize
+    pull: if-not-exists
+    commands:
+      - dockerize -wait tcp://vault:8200 -timeout 1m
+  
+  - name: Enable Vault Transit
+    image: vault:1.5.3
+    environment:
+      VAULT_ADDR: "http://vault:8200"
+      VAULT_TOKEN: "changeme"
+    commands:
+      - vault secrets enable transit
+
   - name: Test & vet
     image: golang:1.18
     environment:
       GO111MODULE: on
+      KAIGARA_VAULT_ADDR: "http://vault:8200"
+      KAIGARA_VAULT_TOKEN: "changeme"
     commands:
       - ./run_tests.sh
 

sonic/handlers/admin.go

@@ -4,15 +4,16 @@ import (
 	"bytes"
 	"encoding/json"
 	"fmt"
-	"github.com/openware/pkg/vault"
-	sonic "github.com/openware/pkg/sonic/config"
 	"io/ioutil"
 	"log"
 	"net/http"
 	"net/url"
 	"path"
 	"time"
 
+	sonic "github.com/openware/pkg/sonic/config"
+	"github.com/openware/pkg/vault"
+
 	"github.com/gin-gonic/gin"
 	"github.com/openware/pkg/jwt"
 	"github.com/openware/pkg/mngapi/peatio"
@@ -62,22 +63,22 @@ func SetSecret(ctx *gin.Context) {
 
 	appName := ctx.Param("component")
 
-	if err := vaultService.LoadSecrets(appName, params.Scope); err != nil {
-		log.Printf("ERR: LoadSecrets: %s", err)
+	if err := vaultService.Read(appName, params.Scope); err != nil {
+		log.Printf("ERR: Read: %s", err)
 		ctx.JSON(http.StatusInternalServerError, gin.H{"error": err.Error()})
 		return
 	}
 
-	err = vaultService.SetSecret(appName, params.Key, params.Value, params.Scope)
+	err = vaultService.SetEntry(appName, params.Scope, params.Key, params.Value)
 	if err != nil {
-		log.Printf("ERR: SetSecret: %s", err)
+		log.Printf("ERR: SetEntry: %s", err)
 		ctx.JSON(http.StatusInternalServerError, gin.H{"error": err.Error()})
 		return
 	}
 
-	err = vaultService.SaveSecrets(appName, params.Scope)
+	err = vaultService.Write(appName, params.Scope)
 	if err != nil {
-		log.Printf("ERR: SaveSecrets: %s", err)
+		log.Printf("ERR: Write: %s", err)
 		ctx.JSON(http.StatusInternalServerError, gin.H{"error": err.Error()})
 		return
 	}
@@ -108,15 +109,15 @@ func GetSecrets(ctx *gin.Context) {
 		result[app] = make(map[string]interface{})
 
 		for _, scope := range scopes {
-			if err := vaultService.LoadSecrets(app, scope); err != nil {
+			if err := vaultService.Read(app, scope); err != nil {
 				ctx.JSON(http.StatusInternalServerError, gin.H{"error": err.Error()})
 				return
 			}
 
 			result[app][scope] = make(map[string]interface{})
 
 			if scope == "secret" {
-				secretsKeys, err := vaultService.ListSecrets(app, scope)
+				secretsKeys, err := vaultService.ListEntries(app, scope)
 				if err != nil {
 					ctx.JSON(http.StatusInternalServerError, gin.H{"error": err.Error()})
 					return
@@ -126,7 +127,7 @@ func GetSecrets(ctx *gin.Context) {
 					result[app][scope].(map[string]interface{})[key] = "******"
 				}
 			} else {
-				secrets, err := vaultService.GetSecrets(app, scope)
+				secrets, err := vaultService.GetEntries(app, scope)
 				if err != nil {
 					ctx.JSON(http.StatusInternalServerError, gin.H{"error": err.Error()})
 					return
@@ -272,7 +273,6 @@ func updateMarkets(sc *SonicContext, engineID string) error {
 	return nil
 }
 
-
 // CreatePlatform to handler '/api/v2/admin/platforms/new'
 func CreatePlatform(ctx *gin.Context, licenseCreator LicenseCreator, fetchConfig FetchConfigFunction) gin.HandlerFunc {
 	return func(context *gin.Context) {
@@ -374,18 +374,18 @@ func createPlatform(ctx *gin.Context, creator LicenseCreator, fetchConfig FetchC
 	scope := "private"
 	key := "platform_id"
 	// Load secret
-	vaultService.LoadSecrets(app, scope)
+	vaultService.Read(app, scope)
 
 	// Set Platform ID to secret
-	err = vaultService.SetSecret(app, key, platform.PID, scope)
+	err = vaultService.SetEntry(app, scope, key, platform.PID)
 	if err != nil {
 		log.Printf("ERROR: Failed to store Platform ID in vault: %s", err.Error())
 		ctx.JSON(http.StatusInternalServerError, gin.H{"error": err.Error()})
 		return
 	}
 
 	// Save secret to vault
-	err = vaultService.SaveSecrets(app, scope)
+	err = vaultService.Write(app, scope)
 	if err != nil {
 		log.Printf("ERROR: Failed to store secrets: %s", err.Error())
 		ctx.JSON(http.StatusInternalServerError, gin.H{"error": err.Error()})

sonic/handlers/helpers.go

@@ -6,9 +6,9 @@ import (
 	"sync"
 
 	"github.com/gin-gonic/gin"
-	"github.com/openware/pkg/vault"
 	"github.com/openware/pkg/jwt"
 	"github.com/openware/pkg/sonic/config"
+	"github.com/openware/pkg/vault"
 )
 
 type cache struct {
@@ -59,7 +59,7 @@ func GetVaultService(ctx *gin.Context) (*vault.Service, error) {
 // 'firstRun' variable will help to run writing to cache on first system start
 // as on the start latest and current versions are the same
 func WriteCache(vaultService *vault.Service, scope string, firstRun bool) {
-	err := vaultService.LoadSecrets("global", scope)
+	err := vaultService.Read("global", scope)
 	if err != nil {
 		panic(err)
 	}
@@ -80,13 +80,13 @@ func WriteCache(vaultService *vault.Service, scope string, firstRun bool) {
 
 	if current != latest || firstRun {
 		log.Println("Writing to cache")
-		keys, err := vaultService.ListSecrets("global", scope)
+		keys, err := vaultService.ListEntries("global", scope)
 		if err != nil {
 			panic(err)
 		}
 
 		for _, key := range keys {
-			val, err := vaultService.GetSecret("global", key, scope)
+			val, err := vaultService.GetEntry("global", key, scope)
 			if err != nil {
 				panic(err)
 			}