software-engineering/zitadel-k8s-operator
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add key fields individually in secret

Browse Source 
[ZITADOPER-1]
This commit is contained in:
Haim Kortovich
2024-05-16 17:39:30 -05:00
parent aa8ce7483c
commit 150a4980b2
1 changed files with 20 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/internal/controller/apiapp_controller.go
View File

@@ -18,6 +18,7 @@ package controller
import ( import (
"context" "context"
"encoding/json"
"fmt" "fmt"
"strings" "strings"
"time" "time"
@@ -187,6 +188,14 @@ func (wr *wrappedAPIAppReconciler) reconcileApp(ctx context.Context, ztdClient *
return wr.Client.Status().Patch(ctx, wr.APIApp, patch) return wr.Client.Status().Patch(ctx, wr.APIApp, patch)
} }
type Key struct {
Type string `json:"type"`
KeyID string `json:"keyId"`
Key string `json:"key"`
AppID string `json:"appId"`
ClientID string `json:"clientId"`
}
func (wr *wrappedAPIAppReconciler) reconcileKeys(ctx context.Context, ztdClient *management.Client) error { func (wr *wrappedAPIAppReconciler) reconcileKeys(ctx context.Context, ztdClient *management.Client) error {
if wr.APIApp.Spec.AuthMethodType == "API_AUTH_METHOD_TYPE_PRIVATE_KEY_JWT" { if wr.APIApp.Spec.AuthMethodType == "API_AUTH_METHOD_TYPE_PRIVATE_KEY_JWT" {
org, err := wr.APIApp.Organization(ctx, wr.refResolver) org, err := wr.APIApp.Organization(ctx, wr.refResolver)
@@ -227,8 +236,17 @@ func (wr *wrappedAPIAppReconciler) reconcileKeys(ctx context.Context, ztdClient
Name: wr.APIApp.Name + "-privatekey-secret", Name: wr.APIApp.Name + "-privatekey-secret",
Namespace: wr.APIApp.Namespace, Namespace: wr.APIApp.Namespace,
} }
var jsonKey Key
secretData := map[string][]byte{"key.json": resp.KeyDetails} if err = json.Unmarshal(resp.KeyDetails, &jsonKey); err != nil {
return fmt.Errorf("Could not unmarshal key details: %v", err)
}
secretData := map[string][]byte{
"clientId": []byte(jsonKey.ClientID),
"type": []byte(jsonKey.Type),
"keyId": []byte(jsonKey.KeyID),
"appId": []byte(jsonKey.AppID),
"key": []byte(jsonKey.Key),
}
secret, err := wr.Builder.BuildSecret(builder.SecretOpts{Immutable: true, Zitadel: nil, Key: key, Data: secretData}, wr.APIApp) secret, err := wr.Builder.BuildSecret(builder.SecretOpts{Immutable: true, Zitadel: nil, Key: key, Data: secretData}, wr.APIApp)
if err != nil { if err != nil {
return fmt.Errorf("error building Secret: %v", err) return fmt.Errorf("error building Secret: %v", err)
@@ -239,7 +257,6 @@ func (wr *wrappedAPIAppReconciler) reconcileKeys(ctx context.Context, ztdClient
patch := ctrlClient.MergeFrom(wr.APIApp.DeepCopy()) patch := ctrlClient.MergeFrom(wr.APIApp.DeepCopy())
wr.APIApp.Status.KeyId = resp.Id wr.APIApp.Status.KeyId = resp.Id
return wr.Client.Status().Patch(ctx, wr.APIApp, patch) return wr.Client.Status().Patch(ctx, wr.APIApp, patch)
} }
return nil return nil
} }