Merge pull request #2 from spiffe/ovolkan/hack

Removed logger for additional decoupling
spiffe · Oct 25, 2024 · 0f0347f · 0f0347f
2 parents 6881805 + 3bb6833
commit 0f0347f
Show file tree

Hide file tree

Showing 33 changed files with 97 additions and 251 deletions.
diff --git a/core/crypto/crypto.go b/core/crypto/crypto.go
diff --git a/core/log/level/level.go b/core/log/level/level.go
diff --git a/core/log/std/log.go b/core/log/std/log.go
diff --git a/core/log/std/print.go b/core/log/std/print.go
diff --git a/internal/config/config.go b/internal/config/config.go
@@ -0,0 +1,7 @@
+package config
+
+type Config struct {
+	Debug bool
+}
+
+var SdkConfig Config = Config{false}
diff --git a/core/constants/crypto/algorithm.go → internal/core/constants/crypto/algorithm.go b/core/constants/crypto/algorithm.go → internal/core/constants/crypto/algorithm.go
diff --git a/core/constants/env/env.go → internal/core/constants/env/env.go b/core/constants/env/env.go → internal/core/constants/env/env.go
diff --git a/core/constants/key/key.go → internal/core/constants/key/key.go b/core/constants/key/key.go → internal/core/constants/key/key.go
diff --git a/core/constants/symbol/symbol.go → internal/core/constants/symbol/symbol.go b/core/constants/symbol/symbol.go → internal/core/constants/symbol/symbol.go
diff --git a/core/constants/val/val.go → internal/core/constants/val/val.go b/core/constants/val/val.go → internal/core/constants/val/val.go
diff --git a/core/entity/v1/data/convert.go → internal/core/entity/v1/data/convert.go b/core/entity/v1/data/convert.go → internal/core/entity/v1/data/convert.go
@@ -9,11 +9,10 @@ import (
 	"bytes"
 	"encoding/json"
 	"fmt"
+	"github.com/spiffe/vsecm-sdk-go/internal/core/constants/key"
+	tpl "github.com/spiffe/vsecm-sdk-go/internal/core/template"
 	"strings"
 	"text/template"
-
-	"github.com/spiffe/vsecm-sdk-go/core/constants/key"
-	tpl "github.com/spiffe/vsecm-sdk-go/core/template"
 )
 
 // convertMapToStringBytes converts a map[string]string into a map[string][]byte,

diff --git a/core/entity/v1/data/secret.go → internal/core/entity/v1/data/secret.go b/core/entity/v1/data/secret.go → internal/core/entity/v1/data/secret.go
@@ -5,7 +5,9 @@
 
 package data
 
-import "github.com/spiffe/vsecm-sdk-go/lib/entity"
+import (
+	"github.com/spiffe/vsecm-sdk-go/internal/lib/entity"
+)
 
 // SecretFormat represents the format of the secret.
 type SecretFormat string

diff --git a/core/entity/v1/data/secret_stored.go → ...rnal/core/entity/v1/data/secret_stored.go b/core/entity/v1/data/secret_stored.go → ...rnal/core/entity/v1/data/secret_stored.go
diff --git a/core/entity/v1/data/status.go → internal/core/entity/v1/data/status.go b/core/entity/v1/data/status.go → internal/core/entity/v1/data/status.go
diff --git a/core/entity/v1/reqres/safe/safe.go → internal/core/entity/v1/reqres/safe/safe.go b/core/entity/v1/reqres/safe/safe.go → internal/core/entity/v1/reqres/safe/safe.go
@@ -6,20 +6,20 @@
 package safe
 
 import (
-	"github.com/spiffe/vsecm-sdk-go/core/constants/crypto"
-	"github.com/spiffe/vsecm-sdk-go/core/entity/v1/data"
+	"github.com/spiffe/vsecm-sdk-go/internal/core/constants/crypto"
+	data2 "github.com/spiffe/vsecm-sdk-go/internal/core/entity/v1/data"
 )
 
 // SecretUpsertRequest is the request to upsert a secret.
 type SecretUpsertRequest struct {
-	WorkloadIds []string          `json:"workloads"`
-	Namespaces  []string          `json:"namespaces"`
-	Value       string            `json:"value"`
-	Template    string            `json:"template"`
-	Format      data.SecretFormat `json:"format"`
-	Encrypt     bool              `json:"encrypt"`
-	NotBefore   string            `json:"notBefore"`
-	Expires     string            `json:"expires"`
+	WorkloadIds []string           `json:"workloads"`
+	Namespaces  []string           `json:"namespaces"`
+	Value       string             `json:"value"`
+	Template    string             `json:"template"`
+	Format      data2.SecretFormat `json:"format"`
+	Encrypt     bool               `json:"encrypt"`
+	NotBefore   string             `json:"notBefore"`
+	Expires     string             `json:"expires"`
 
 	Err string `json:"err,omitempty"`
 }
@@ -81,16 +81,16 @@ type SecretListRequest struct {
 
 // SecretListResponse is the response to a SecretListRequest.
 type SecretListResponse struct {
-	Secrets []data.Secret `json:"secrets"`
-	Err     string        `json:"err,omitempty"`
+	Secrets []data2.Secret `json:"secrets"`
+	Err     string         `json:"err,omitempty"`
 }
 
 // SecretEncryptedListResponse is the response that lists secrets
 // The secret values will be encrypted.
 type SecretEncryptedListResponse struct {
-	Secrets   []data.SecretEncrypted `json:"secrets"`
-	Algorithm crypto.Algorithm       `json:"algorithm"`
-	Err       string                 `json:"err,omitempty"`
+	Secrets   []data2.SecretEncrypted `json:"secrets"`
+	Algorithm crypto.Algorithm        `json:"algorithm"`
+	Err       string                  `json:"err,omitempty"`
 }
 
 // KeystoneStatusRequest is the request to check the status of
@@ -101,8 +101,8 @@ type KeystoneStatusRequest struct {
 
 // KeystoneStatusResponse is the response to a KeystoneStatusRequest.
 type KeystoneStatusResponse struct {
-	Status data.InitStatus `json:"status"`
-	Err    string          `json:"err,omitempty"`
+	Status data2.InitStatus `json:"status"`
+	Err    string           `json:"err,omitempty"`
 }
 
 // GenericRequest is the request for generic operations.

diff --git a/core/env/endpoint.go → internal/core/env/endpoint.go b/core/env/endpoint.go → internal/core/env/endpoint.go
@@ -6,7 +6,7 @@
 package env
 
 import (
-	"github.com/spiffe/vsecm-sdk-go/core/constants/env"
+	"github.com/spiffe/vsecm-sdk-go/internal/core/constants/env"
 )
 
 // EndpointUrlForSafe returns the URL for the VSecM Safe endpoint

diff --git a/core/env/init.go → internal/core/env/init.go b/core/env/init.go → internal/core/env/init.go
@@ -6,10 +6,9 @@
 package env
 
 import (
+	"github.com/spiffe/vsecm-sdk-go/internal/core/constants/env"
 	"strconv"
 	"time"
-
-	"github.com/spiffe/vsecm-sdk-go/core/constants/env"
 )
 
 // PollIntervalForInitContainer returns the time interval between each poll in the

diff --git a/core/env/logging.go → internal/core/env/logging.go b/core/env/logging.go → internal/core/env/logging.go
@@ -6,9 +6,8 @@
 package env
 
 import (
+	"github.com/spiffe/vsecm-sdk-go/internal/core/constants/env"
 	"strconv"
-
-	"github.com/spiffe/vsecm-sdk-go/core/constants/env"
 )
 
 type Level int

diff --git a/core/env/poll.go → internal/core/env/poll.go b/core/env/poll.go → internal/core/env/poll.go
@@ -6,10 +6,9 @@
 package env
 
 import (
+	"github.com/spiffe/vsecm-sdk-go/internal/core/constants/env"
 	"strconv"
 	"time"
-
-	"github.com/spiffe/vsecm-sdk-go/core/constants/env"
 )
 
 // PollIntervalForSidecar returns the polling interval for sentry in time.Duration

diff --git a/core/env/sidecar.go → internal/core/env/sidecar.go b/core/env/sidecar.go → internal/core/env/sidecar.go
@@ -6,7 +6,7 @@
 package env
 
 import (
-	"github.com/spiffe/vsecm-sdk-go/core/constants/env"
+	"github.com/spiffe/vsecm-sdk-go/internal/core/constants/env"
 )
 
 // SecretsPathForSidecar returns the path to the secrets file used by the sidecar.

diff --git a/core/env/spiffe.go → internal/core/env/spiffe.go b/core/env/spiffe.go → internal/core/env/spiffe.go
@@ -6,7 +6,7 @@
 package env
 
 import (
-	"github.com/spiffe/vsecm-sdk-go/core/constants/env"
+	"github.com/spiffe/vsecm-sdk-go/internal/core/constants/env"
 )
 
 // SpiffeSocketUrl returns the URL for the SPIFFE endpoint socket used in the

diff --git a/core/env/spiffeid.go → internal/core/env/spiffeid.go b/core/env/spiffeid.go → internal/core/env/spiffeid.go
@@ -6,7 +6,7 @@
 package env
 
 import (
-	"github.com/spiffe/vsecm-sdk-go/core/constants/env"
+	"github.com/spiffe/vsecm-sdk-go/internal/core/constants/env"
 )
 
 // SpiffeIdPrefixForSafe returns the prefix for the Safe SPIFFE ID.

diff --git a/core/template/filter.go → internal/core/template/filter.go b/core/template/filter.go → internal/core/template/filter.go
@@ -6,10 +6,9 @@
 package template
 
 import (
+	"github.com/spiffe/vsecm-sdk-go/internal/core/constants/symbol"
+	"github.com/spiffe/vsecm-sdk-go/internal/core/constants/val"
 	"strings"
-
-	"github.com/spiffe/vsecm-sdk-go/core/constants/symbol"
-	"github.com/spiffe/vsecm-sdk-go/core/constants/val"
 )
 
 // removeKeyValueWithNoValue takes an input string containing key-value pairs

diff --git a/core/template/template.go → internal/core/template/template.go b/core/template/template.go → internal/core/template/template.go