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
22 changes: 11 additions & 11 deletions module/app_container.go
Original file line number Diff line number Diff line change
Expand Up @@ -82,9 +82,9 @@ type ECSAppManifests struct {

// ECSAppTaskDef represents an ECS task definition for an app container.
type ECSAppTaskDef struct {
Family string `json:"family"`
CPU string `json:"cpu"`
Memory string `json:"memory"`
Family string `json:"family"`
CPU string `json:"cpu"`
Memory string `json:"memory"`
Containers []ECSContainer `json:"containers"`
}

Expand Down Expand Up @@ -292,17 +292,17 @@ type K8sDeploymentManifest struct {

// K8sServiceManifest represents a Kubernetes Service resource.
type K8sServiceManifest struct {
APIVersion string `json:"apiVersion"`
Kind string `json:"kind"`
Metadata K8sObjectMeta `json:"metadata"`
APIVersion string `json:"apiVersion"`
Kind string `json:"kind"`
Metadata K8sObjectMeta `json:"metadata"`
Spec K8sServiceSpec `json:"spec"`
}

// K8sIngressManifest represents a Kubernetes Ingress resource.
type K8sIngressManifest struct {
APIVersion string `json:"apiVersion"`
Kind string `json:"kind"`
Metadata K8sObjectMeta `json:"metadata"`
APIVersion string `json:"apiVersion"`
Kind string `json:"kind"`
Metadata K8sObjectMeta `json:"metadata"`
Spec K8sIngressSpec `json:"spec"`
}

Expand Down Expand Up @@ -408,8 +408,8 @@ type K8sIngressHTTP struct {

// K8sIngressPath defines an HTTP path in an ingress rule.
type K8sIngressPath struct {
Path string `json:"path"`
PathType string `json:"pathType"`
Path string `json:"path"`
PathType string `json:"pathType"`
Backend K8sIngressBackend `json:"backend"`
}

Expand Down
10 changes: 5 additions & 5 deletions module/argo_workflows.go
Original file line number Diff line number Diff line change
Expand Up @@ -35,9 +35,9 @@ type ArgoWorkflowSpec struct {

// ArgoTemplate is a single template (DAG or step list) within an Argo Workflow.
type ArgoTemplate struct {
Name string `json:"name"`
Kind string `json:"kind"` // dag, steps, container
DAG []ArgoDAGTask `json:"dag,omitempty"`
Name string `json:"name"`
Kind string `json:"kind"` // dag, steps, container
DAG []ArgoDAGTask `json:"dag,omitempty"`
Container *ArgoContainer `json:"container,omitempty"`
}

Expand Down Expand Up @@ -408,8 +408,8 @@ func (b *argoMockBackend) listWorkflows(m *ArgoWorkflowsModule, labelSelector st
// argoRealBackend implements argoBackend using the Argo Workflows REST API.
// It targets the Argo Server HTTP API (default port 2746).
type argoRealBackend struct {
endpoint string // e.g. http://argo-server.argo.svc.cluster.local:2746
token string // Bearer token (optional)
endpoint string // e.g. http://argo-server.argo.svc.cluster.local:2746
token string // Bearer token (optional)
httpClient *http.Client
}

Expand Down
8 changes: 4 additions & 4 deletions module/cloud_account_aws_creds.go
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ func init() {
// awsStaticResolver resolves AWS credentials from static config fields.
type awsStaticResolver struct{}

func (r *awsStaticResolver) Provider() string { return "aws" }
func (r *awsStaticResolver) Provider() string { return "aws" }
func (r *awsStaticResolver) CredentialType() string { return "static" }

func (r *awsStaticResolver) Resolve(m *CloudAccount) error {
Expand All @@ -38,7 +38,7 @@ func (r *awsStaticResolver) Resolve(m *CloudAccount) error {
// awsEnvResolver resolves AWS credentials from environment variables.
type awsEnvResolver struct{}

func (r *awsEnvResolver) Provider() string { return "aws" }
func (r *awsEnvResolver) Provider() string { return "aws" }
func (r *awsEnvResolver) CredentialType() string { return "env" }

func (r *awsEnvResolver) Resolve(m *CloudAccount) error {
Expand All @@ -59,7 +59,7 @@ func (r *awsEnvResolver) Resolve(m *CloudAccount) error {
// using aws-sdk-go-v2/config.LoadDefaultConfig with WithSharedConfigProfile.
type awsProfileResolver struct{}

func (r *awsProfileResolver) Provider() string { return "aws" }
func (r *awsProfileResolver) Provider() string { return "aws" }
func (r *awsProfileResolver) CredentialType() string { return "profile" }

func (r *awsProfileResolver) Resolve(m *CloudAccount) error {
Expand Down Expand Up @@ -102,7 +102,7 @@ func (r *awsProfileResolver) Resolve(m *CloudAccount) error {
// sts:AssumeRole to obtain temporary credentials for the target role.
type awsRoleARNResolver struct{}

func (r *awsRoleARNResolver) Provider() string { return "aws" }
func (r *awsRoleARNResolver) Provider() string { return "aws" }
func (r *awsRoleARNResolver) CredentialType() string { return "role_arn" }

func (r *awsRoleARNResolver) Resolve(m *CloudAccount) error {
Expand Down
10 changes: 5 additions & 5 deletions module/cloud_account_azure.go
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ func init() {
// azureStaticResolver resolves Azure credentials from static config fields.
type azureStaticResolver struct{}

func (r *azureStaticResolver) Provider() string { return "azure" }
func (r *azureStaticResolver) Provider() string { return "azure" }
func (r *azureStaticResolver) CredentialType() string { return "static" }

func (r *azureStaticResolver) Resolve(m *CloudAccount) error {
Expand All @@ -36,7 +36,7 @@ func (r *azureStaticResolver) Resolve(m *CloudAccount) error {
// azureEnvResolver resolves Azure credentials from environment variables.
type azureEnvResolver struct{}

func (r *azureEnvResolver) Provider() string { return "azure" }
func (r *azureEnvResolver) Provider() string { return "azure" }
func (r *azureEnvResolver) CredentialType() string { return "env" }

func (r *azureEnvResolver) Resolve(m *CloudAccount) error {
Expand All @@ -52,7 +52,7 @@ func (r *azureEnvResolver) Resolve(m *CloudAccount) error {
// azureClientCredentialsResolver resolves Azure service principal client credentials.
type azureClientCredentialsResolver struct{}

func (r *azureClientCredentialsResolver) Provider() string { return "azure" }
func (r *azureClientCredentialsResolver) Provider() string { return "azure" }
func (r *azureClientCredentialsResolver) CredentialType() string { return "client_credentials" }

func (r *azureClientCredentialsResolver) Resolve(m *CloudAccount) error {
Expand All @@ -74,7 +74,7 @@ func (r *azureClientCredentialsResolver) Resolve(m *CloudAccount) error {
// Production: use github.com/Azure/azure-sdk-for-go/sdk/azidentity ManagedIdentityCredential.
type azureManagedIdentityResolver struct{}

func (r *azureManagedIdentityResolver) Provider() string { return "azure" }
func (r *azureManagedIdentityResolver) Provider() string { return "azure" }
func (r *azureManagedIdentityResolver) CredentialType() string { return "managed_identity" }

func (r *azureManagedIdentityResolver) Resolve(m *CloudAccount) error {
Expand All @@ -95,7 +95,7 @@ func (r *azureManagedIdentityResolver) Resolve(m *CloudAccount) error {
// Production: use github.com/Azure/azure-sdk-for-go/sdk/azidentity AzureCLICredential.
type azureCLIResolver struct{}

func (r *azureCLIResolver) Provider() string { return "azure" }
func (r *azureCLIResolver) Provider() string { return "azure" }
func (r *azureCLIResolver) CredentialType() string { return "cli" }

func (r *azureCLIResolver) Resolve(m *CloudAccount) error {
Expand Down
6 changes: 3 additions & 3 deletions module/cloud_account_do.go
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ func init() {
// doStaticResolver resolves DigitalOcean credentials from static config fields.
type doStaticResolver struct{}

func (r *doStaticResolver) Provider() string { return "digitalocean" }
func (r *doStaticResolver) Provider() string { return "digitalocean" }
func (r *doStaticResolver) CredentialType() string { return "static" }

func (r *doStaticResolver) Resolve(m *CloudAccount) error {
Expand All @@ -32,7 +32,7 @@ func (r *doStaticResolver) Resolve(m *CloudAccount) error {
// doEnvResolver resolves DigitalOcean credentials from environment variables.
type doEnvResolver struct{}

func (r *doEnvResolver) Provider() string { return "digitalocean" }
func (r *doEnvResolver) Provider() string { return "digitalocean" }
func (r *doEnvResolver) CredentialType() string { return "env" }

func (r *doEnvResolver) Resolve(m *CloudAccount) error {
Expand All @@ -46,7 +46,7 @@ func (r *doEnvResolver) Resolve(m *CloudAccount) error {
// doAPITokenResolver resolves a DigitalOcean API token from explicit config.
type doAPITokenResolver struct{}

func (r *doAPITokenResolver) Provider() string { return "digitalocean" }
func (r *doAPITokenResolver) Provider() string { return "digitalocean" }
func (r *doAPITokenResolver) CredentialType() string { return "api_token" }

func (r *doAPITokenResolver) Resolve(m *CloudAccount) error {
Expand Down
12 changes: 6 additions & 6 deletions module/cloud_account_gcp.go
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ func init() {
// gcpStaticResolver resolves GCP credentials from static config fields.
type gcpStaticResolver struct{}

func (r *gcpStaticResolver) Provider() string { return "gcp" }
func (r *gcpStaticResolver) Provider() string { return "gcp" }
func (r *gcpStaticResolver) CredentialType() string { return "static" }

func (r *gcpStaticResolver) Resolve(m *CloudAccount) error {
Expand All @@ -37,7 +37,7 @@ func (r *gcpStaticResolver) Resolve(m *CloudAccount) error {
// gcpEnvResolver resolves GCP credentials from environment variables.
type gcpEnvResolver struct{}

func (r *gcpEnvResolver) Provider() string { return "gcp" }
func (r *gcpEnvResolver) Provider() string { return "gcp" }
func (r *gcpEnvResolver) CredentialType() string { return "env" }

func (r *gcpEnvResolver) Resolve(m *CloudAccount) error {
Expand All @@ -59,7 +59,7 @@ func (r *gcpEnvResolver) Resolve(m *CloudAccount) error {
// gcpServiceAccountJSONResolver reads a GCP service account JSON key file from the given path.
type gcpServiceAccountJSONResolver struct{}

func (r *gcpServiceAccountJSONResolver) Provider() string { return "gcp" }
func (r *gcpServiceAccountJSONResolver) Provider() string { return "gcp" }
func (r *gcpServiceAccountJSONResolver) CredentialType() string { return "service_account_json" }

func (r *gcpServiceAccountJSONResolver) Resolve(m *CloudAccount) error {
Expand All @@ -82,7 +82,7 @@ func (r *gcpServiceAccountJSONResolver) Resolve(m *CloudAccount) error {
// gcpServiceAccountKeyResolver uses an inline GCP service account JSON key.
type gcpServiceAccountKeyResolver struct{}

func (r *gcpServiceAccountKeyResolver) Provider() string { return "gcp" }
func (r *gcpServiceAccountKeyResolver) Provider() string { return "gcp" }
func (r *gcpServiceAccountKeyResolver) CredentialType() string { return "service_account_key" }

func (r *gcpServiceAccountKeyResolver) Resolve(m *CloudAccount) error {
Expand All @@ -102,7 +102,7 @@ func (r *gcpServiceAccountKeyResolver) Resolve(m *CloudAccount) error {
// Production: use golang.org/x/oauth2/google with google.FindDefaultCredentials.
type gcpWorkloadIdentityResolver struct{}

func (r *gcpWorkloadIdentityResolver) Provider() string { return "gcp" }
func (r *gcpWorkloadIdentityResolver) Provider() string { return "gcp" }
func (r *gcpWorkloadIdentityResolver) CredentialType() string { return "workload_identity" }

func (r *gcpWorkloadIdentityResolver) Resolve(m *CloudAccount) error {
Expand All @@ -117,7 +117,7 @@ func (r *gcpWorkloadIdentityResolver) Resolve(m *CloudAccount) error {
// Reads GOOGLE_APPLICATION_CREDENTIALS if set; otherwise records the ADC source.
type gcpApplicationDefaultResolver struct{}

func (r *gcpApplicationDefaultResolver) Provider() string { return "gcp" }
func (r *gcpApplicationDefaultResolver) Provider() string { return "gcp" }
func (r *gcpApplicationDefaultResolver) CredentialType() string { return "application_default" }

func (r *gcpApplicationDefaultResolver) Resolve(m *CloudAccount) error {
Expand Down
6 changes: 3 additions & 3 deletions module/cloud_account_k8s.go
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ func init() {
// k8sStaticResolver resolves Kubernetes credentials from static config fields.
type k8sStaticResolver struct{}

func (r *k8sStaticResolver) Provider() string { return "kubernetes" }
func (r *k8sStaticResolver) Provider() string { return "kubernetes" }
func (r *k8sStaticResolver) CredentialType() string { return "static" }

func (r *k8sStaticResolver) Resolve(m *CloudAccount) error {
Expand All @@ -32,7 +32,7 @@ func (r *k8sStaticResolver) Resolve(m *CloudAccount) error {
// k8sEnvResolver resolves Kubernetes credentials from the KUBECONFIG environment variable.
type k8sEnvResolver struct{}

func (r *k8sEnvResolver) Provider() string { return "kubernetes" }
func (r *k8sEnvResolver) Provider() string { return "kubernetes" }
func (r *k8sEnvResolver) CredentialType() string { return "env" }

func (r *k8sEnvResolver) Resolve(m *CloudAccount) error {
Expand All @@ -52,7 +52,7 @@ func (r *k8sEnvResolver) Resolve(m *CloudAccount) error {
// k8sKubeconfigResolver resolves Kubernetes credentials from a kubeconfig file or inline content.
type k8sKubeconfigResolver struct{}

func (r *k8sKubeconfigResolver) Provider() string { return "kubernetes" }
func (r *k8sKubeconfigResolver) Provider() string { return "kubernetes" }
func (r *k8sKubeconfigResolver) CredentialType() string { return "kubeconfig" }

func (r *k8sKubeconfigResolver) Resolve(m *CloudAccount) error {
Expand Down
10 changes: 5 additions & 5 deletions module/gitlab_client_module.go
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,11 @@ import (
//
// Config:
//
// - name: gitlab-client
// type: gitlab.client
// config:
// url: "https://gitlab.com" # or self-hosted URL; use "mock://" for testing
// token: "${GITLAB_TOKEN}"
// - name: gitlab-client
// type: gitlab.client
// config:
// url: "https://gitlab.com" # or self-hosted URL; use "mock://" for testing
// token: "${GITLAB_TOKEN}"
type GitLabClientModule struct {
name string
config map[string]any
Expand Down
20 changes: 10 additions & 10 deletions module/gitlab_webhook.go
Original file line number Diff line number Diff line change
Expand Up @@ -34,12 +34,12 @@ type GitEvent struct {
//
// Config:
//
// - name: gitlab-hooks
// type: gitlab.webhook
// config:
// secret: "${GITLAB_WEBHOOK_SECRET}"
// path: /webhooks/gitlab # optional, default: /webhooks/gitlab
// events: [push, merge_request, tag_push, pipeline]
// - name: gitlab-hooks
// type: gitlab.webhook
// config:
// secret: "${GITLAB_WEBHOOK_SECRET}"
// path: /webhooks/gitlab # optional, default: /webhooks/gitlab
// events: [push, merge_request, tag_push, pipeline]
type GitLabWebhookModule struct {
name string
config map[string]any
Expand Down Expand Up @@ -255,10 +255,10 @@ func normalizeGitLabEventType(header string) string {
// GitLabWebhookParseStep is a pipeline step that parses a GitLab webhook from
// the HTTP request in the pipeline context.
//
// - name: parse-webhook
// type: step.gitlab_parse_webhook
// config:
// secret: "${GITLAB_WEBHOOK_SECRET}" # optional; skips validation if empty
// - name: parse-webhook
// type: step.gitlab_parse_webhook
// config:
// secret: "${GITLAB_WEBHOOK_SECRET}" # optional; skips validation if empty
type GitLabWebhookParseStep struct {
name string
secret string
Expand Down
28 changes: 14 additions & 14 deletions module/jwt_auth.go
Original file line number Diff line number Diff line change
Expand Up @@ -30,20 +30,20 @@ type User struct {
// When an auth.user-store service is available, it delegates user CRUD to it;
// otherwise it uses its own internal map for backward compatibility.
type JWTAuthModule struct {
name string
secret string
tokenExpiry time.Duration
issuer string
seedFile string
responseFormat string // "standard" (default) or "v1" (access_token/refresh_token)
users map[string]*User // keyed by email (used when no external userStore)
mu sync.RWMutex
nextID int
app modular.Application
logger modular.Logger
persistence *PersistenceStore // optional write-through backend
userStore *UserStore // optional external user store (from auth.user-store module)
allowRegistration bool // when true, any visitor may self-register
name string
secret string
tokenExpiry time.Duration
issuer string
seedFile string
responseFormat string // "standard" (default) or "v1" (access_token/refresh_token)
users map[string]*User // keyed by email (used when no external userStore)
mu sync.RWMutex
nextID int
app modular.Application
logger modular.Logger
persistence *PersistenceStore // optional write-through backend
userStore *UserStore // optional external user store (from auth.user-store module)
allowRegistration bool // when true, any visitor may self-register
}

// NewJWTAuthModule creates a new JWT auth module
Expand Down
2 changes: 1 addition & 1 deletion module/nosql_dynamodb.go
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ import (
type DynamoDBNoSQLConfig struct {
TableName string `json:"tableName" yaml:"tableName"`
Region string `json:"region" yaml:"region"`
Endpoint string `json:"endpoint" yaml:"endpoint"` // "local" => in-memory fallback
Endpoint string `json:"endpoint" yaml:"endpoint"` // "local" => in-memory fallback
Credentials string `json:"credentials" yaml:"credentials"` // ref to cloud.account module name
}

Expand Down
8 changes: 4 additions & 4 deletions module/nosql_memory.go
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,10 @@ type MemoryNoSQLConfig struct {
// MemoryNoSQL is a thread-safe in-memory NoSQL store.
// type: nosql.memory — useful for testing and local scenarios.
type MemoryNoSQL struct {
name string
cfg MemoryNoSQLConfig
mu sync.RWMutex
items map[string]map[string]any
name string
cfg MemoryNoSQLConfig
mu sync.RWMutex
items map[string]map[string]any
}

// NewMemoryNoSQL creates a new MemoryNoSQL module.
Expand Down
2 changes: 1 addition & 1 deletion module/nosql_mongodb.go
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ import (
//
// When uri == "memory://" the module falls back to the in-memory backend.
type MongoDBNoSQLConfig struct {
URI string `json:"uri" yaml:"uri"` // "memory://" => in-memory fallback
URI string `json:"uri" yaml:"uri"` // "memory://" => in-memory fallback
Database string `json:"database" yaml:"database"`
Collection string `json:"collection" yaml:"collection"`
}
Expand Down
Loading
Loading