Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 0 additions & 32 deletions components/backend/git/operations.go
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@ import (
"strings"
"time"

"k8s.io/apimachinery/pkg/api/errors"
v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/runtime/schema"
"k8s.io/client-go/dynamic"
Expand All @@ -45,37 +44,6 @@ type DiffSummary struct {
FilesRemoved int `json:"files_removed"`
}

// getProjectSettings retrieves the ProjectSettings CR for a project using the provided dynamic client
func getProjectSettings(ctx context.Context, dynClient dynamic.Interface, projectName string) (*ProjectSettings, error) {
if dynClient == nil {
return &ProjectSettings{}, nil
}

if GetProjectSettingsResource == nil {
return &ProjectSettings{}, nil
}

gvr := GetProjectSettingsResource()
obj, err := dynClient.Resource(gvr).Namespace(projectName).Get(ctx, "projectsettings", v1.GetOptions{})
if err != nil {
if errors.IsNotFound(err) {
return &ProjectSettings{}, nil
}
return nil, fmt.Errorf("failed to get ProjectSettings: %w", err)
}

settings := &ProjectSettings{}
if obj != nil {
if spec, ok := obj.Object["spec"].(map[string]interface{}); ok {
if v, ok := spec["runnerSecretsName"].(string); ok {
settings.RunnerSecret = strings.TrimSpace(v)
}
}
}

return settings, nil
}

// GetGitHubToken tries to get a GitHub token from GitHub App first, then falls back to project runner secret
func GetGitHubToken(ctx context.Context, k8sClient *kubernetes.Clientset, dynClient dynamic.Interface, project, userID string) (string, error) {
// Try GitHub App first if available
Expand Down
14 changes: 7 additions & 7 deletions components/backend/handlers/content.go
Original file line number Diff line number Diff line change
Expand Up @@ -511,13 +511,13 @@ func ContentWorkflowMetadata(c *gin.Context) {
shortCommand = commandName[lastDot+1:]
}

commands = append(commands, map[string]interface{}{
"id": commandName,
"name": displayName,
"description": metadata["description"],
"slashCommand": "/" + shortCommand,
"icon": metadata["icon"],
})
commands = append(commands, map[string]interface{}{
"id": commandName,
"name": displayName,
"description": metadata["description"],
"slashCommand": "/" + shortCommand,
"icon": metadata["icon"],
})
}
}
log.Printf("ContentWorkflowMetadata: found %d commands", len(commands))
Expand Down
2 changes: 1 addition & 1 deletion components/operator/internal/handlers/sessions.go
Original file line number Diff line number Diff line change
Expand Up @@ -312,7 +312,7 @@ func handleAgenticSessionEvent(obj *unstructured.Unstructured) error {
maxTokens, _, _ := unstructured.NestedInt64(llmSettings, "maxTokens")

// Hardcoded secret names (convention over configuration)
const runnerSecretsName = "ambient-runner-secrets" // ANTHROPIC_API_KEY only (ignored when Vertex enabled)
const runnerSecretsName = "ambient-runner-secrets" // ANTHROPIC_API_KEY only (ignored when Vertex enabled)
const integrationSecretsName = "ambient-non-vertex-integrations" // GIT_*, JIRA_*, custom keys (optional)

// Check if integration secrets exist (optional)
Expand Down
Loading