1Password/onepassword-operator
1
0
Fork 0
mirror of https://github.com/1Password/onepassword-operator.git synced 2025-10-22 07:28:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Code cleanup

Browse Source
This commit is contained in:
jillianwilson
2021-10-15 17:25:28 -03:00
parent ad02c6f6c0
commit 2fb8d7ef85
2 changed files with 12 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
operator/cmd/manager/main.go
View File

@@ -17,7 +17,6 @@ import (
"github.com/suborbital/grav/discovery/local" "github.com/suborbital/grav/discovery/local"
"github.com/suborbital/grav/grav" "github.com/suborbital/grav/grav"
"github.com/suborbital/grav/transport/websocket" "github.com/suborbital/grav/transport/websocket"
"github.com/suborbital/vektor/vlog"
// Import all Kubernetes client auth plugins (e.g. Azure, GCP, OIDC, etc.) // Import all Kubernetes client auth plugins (e.g. Azure, GCP, OIDC, etc.)
@@ -45,6 +44,7 @@ import (
"sigs.k8s.io/controller-runtime/pkg/manager/signals" "sigs.k8s.io/controller-runtime/pkg/manager/signals"
) )
const connectBusPortVariable = "OP_BUS_PORT"
const envHostVariable = "OP_CONNECT_HOST" const envHostVariable = "OP_CONNECT_HOST"
const envPollingIntervalVariable = "POLLING_INTERVAL" const envPollingIntervalVariable = "POLLING_INTERVAL"
const manageConnect = "MANAGE_CONNECT" const manageConnect = "MANAGE_CONNECT"
@@ -315,20 +315,16 @@ func shouldAutoRestartDeployments() bool {
} }
func consumeConnectEvents(updateSecretsHandler op.SecretUpdateHandler) { func consumeConnectEvents(updateSecretsHandler op.SecretUpdateHandler) {
log.Info(fmt.Sprintf("Operator Version: %s", version.Version))
log.Info("Testing stuff")
logger := vlog.Default(vlog.Level(vlog.LogLevelDebug))
gwss := websocket.New() gwss := websocket.New()
locald := local.New() locald := local.New()
port := "42829" port, found := os.LookupEnv(connectBusPortVariable)
if port, err := strconv.Atoi(os.Getenv("OP_BUS_PORT")); err == nil { if !found {
port = port port = "42829"
} }
g := grav.New( g := grav.New(
grav.UseLogger(logger), grav.UseEndpoint(port, fmt.Sprintf("%s/meta/message", envHostVariable)),
grav.UseEndpoint(port, "http://onepassword-connect/meta/message"),
grav.UseTransport(gwss), grav.UseTransport(gwss),
grav.UseDiscovery(locald), grav.UseDiscovery(locald),
) )
@@ -337,8 +333,9 @@ func consumeConnectEvents(updateSecretsHandler op.SecretUpdateHandler) {
pod.OnType(message.TypeItemUpdate, ItemUpdate(updateSecretsHandler)) pod.OnType(message.TypeItemUpdate, ItemUpdate(updateSecretsHandler))
} }
// B5ItemUsage Grav message handler for activity.event messages. On READ // ItemUpdateEvent Grav message handler for activity.event messages. Starts update
// events an update will be sent to the b5 api // process for updating Kubernetes Secrets and OnePasswordItems and triggers
// auto restarts for deployments
func ItemUpdate(updateSecretsHandler op.SecretUpdateHandler) grav.MsgFunc { func ItemUpdate(updateSecretsHandler op.SecretUpdateHandler) grav.MsgFunc {
return func(msg grav.Message) error { return func(msg grav.Message) error {
e := message.ItemUpdateEvent{} e := message.ItemUpdateEvent{}
@@ -347,7 +344,7 @@ func ItemUpdate(updateSecretsHandler op.SecretUpdateHandler) grav.MsgFunc {
return nil return nil
} }
log.Info(fmt.Sprintf("Detected update for item %s at vault %s", e.ItemId, e.VaultId)) log.Info(fmt.Sprintf("Detected update for item %s at vault %s", e.ItemUUID, e.VaultUUID))
updateSecretsHandler.UpdateKubernetesSecretsTask("", "") updateSecretsHandler.UpdateKubernetesSecretsTask("", "")
return nil return nil

6
operator/pkg/onepassword/message/item_update.go
View File

@@ -9,9 +9,9 @@ const (
// ItemUpdateEvent is the data for a sync status message // ItemUpdateEvent is the data for a sync status message
type ItemUpdateEvent struct { type ItemUpdateEvent struct {
VaultId string `json:"vaultId"` VaultUUID string `json:"vault_uuid"`
ItemId string `json:"itemId"` ItemUUID string `json:"item_uuid"`
Version string `json:"version"` ItemVersion string `json:"item_version"`
} }
// Type returns a the syns status data type // Type returns a the syns status data type