timonel 2.8.3 → 2.9.1

package/dist/lib/utils/helmHelpers.d.ts

@@ -3,7 +3,23 @@ export interface HelperDefinition {
     template: string;
 }
 export declare const STANDARD_HELPERS: HelperDefinition[];
+export declare const FILE_ACCESS_HELPERS: HelperDefinition[];
+export declare const TEMPLATE_FUNCTION_HELPERS: HelperDefinition[];
+export declare const SPRIG_HELPERS: HelperDefinition[];
+export declare const KUBERNETES_HELPERS: HelperDefinition[];
 export declare const AWS_HELPERS: HelperDefinition[];
 export declare function formatHelpers(helpers: HelperDefinition[]): string;
-export declare function getDefaultHelpers(cloudProvider?: 'aws'): HelperDefinition[];
-export declare function generateHelpersTemplate(cloudProvider?: 'aws', customHelpers?: HelperDefinition[]): string;
+export declare function getDefaultHelpers(cloudProvider?: 'aws', options?: {
+    includeFileAccess?: boolean;
+    includeTemplateFunction?: boolean;
+    includeSprig?: boolean;
+    includeKubernetes?: boolean;
+}): HelperDefinition[];
+export declare function generateHelpersTemplate(cloudProvider?: 'aws', customHelpers?: HelperDefinition[], options?: {
+    includeFileAccess?: boolean;
+    includeTemplateFunction?: boolean;
+    includeSprig?: boolean;
+    includeKubernetes?: boolean;
+}): string;
+export declare function getHelpersByCategory(category: 'standard' | 'fileAccess' | 'templateFunction' | 'sprig' | 'kubernetes' | 'aws'): HelperDefinition[];
+export declare function createHelper(name: string, template: string): HelperDefinition;

package/dist/lib/utils/helmHelpers.js

@@ -35,6 +35,203 @@ app.kubernetes.io/managed-by: {{ .Release.Service }}`,
 app.kubernetes.io/instance: {{ .Release.Name }}`,
     },
 ];
+export const FILE_ACCESS_HELPERS = [
+    {
+        name: 'files.configFromFile',
+        template: `{{- $path := . -}}
+{{- if $.Files.Get $path -}}
+{{- $.Files.Get $path | nindent 2 -}}
+{{- else -}}
+{{- fail (printf "File %s not found in chart" $path) -}}
+{{- end -}}`,
+    },
+    {
+        name: 'files.configMapFromFiles',
+        template: `{{- $root := . -}}
+{{- $pattern := .pattern -}}
+{{- $files := .files | default ($root.Files.Glob $pattern) -}}
+{{- range $path, $content := $files }}
+  {{ base $path }}: |
+{{ $content | indent 4 }}
+{{- end }}`,
+    },
+    {
+        name: 'files.secretFromFiles',
+        template: `{{- $root := . -}}
+{{- $pattern := .pattern -}}
+{{- $files := .files | default ($root.Files.Glob $pattern) -}}
+{{- range $path, $content := $files }}
+  {{ base $path }}: {{ $content | b64enc }}
+{{- end }}`,
+    },
+    {
+        name: 'files.exists',
+        template: `{{- $path := . -}}
+{{- if $.Files.Get $path -}}
+true
+{{- else -}}
+false
+{{- end -}}`,
+    },
+];
+export const TEMPLATE_FUNCTION_HELPERS = [
+    {
+        name: 'template.render',
+        template: `{{- $template := .template -}}
+{{- $context := .context | default . -}}
+{{- tpl $template $context -}}`,
+    },
+    {
+        name: 'template.renderWithValues',
+        template: `{{- $template := .template -}}
+{{- $values := .values | default dict -}}
+{{- $context := merge $values . -}}
+{{- tpl $template $context -}}`,
+    },
+    {
+        name: 'validation.required',
+        template: `{{- $value := .value -}}
+{{- $message := .message | default (printf "Value %s is required" .key) -}}
+{{- required $message $value -}}`,
+    },
+    {
+        name: 'validation.requireAny',
+        template: `{{- $values := .values -}}
+{{- $message := .message | default "At least one value is required" -}}
+{{- $found := false -}}
+{{- range $values -}}
+{{- if . -}}
+{{- $found = true -}}
+{{- end -}}
+{{- end -}}
+{{- if not $found -}}
+{{- fail $message -}}
+{{- end -}}`,
+    },
+];
+export const SPRIG_HELPERS = [
+    {
+        name: 'string.camelCase',
+        template: `{{- . | camelcase }}`,
+    },
+    {
+        name: 'string.kebabCase',
+        template: `{{- . | kebabcase }}`,
+    },
+    {
+        name: 'string.snakeCase',
+        template: `{{- . | snakecase }}`,
+    },
+    {
+        name: 'string.randomAlphaNum',
+        template: `{{- $length := . | default 8 -}}
+{{- randAlphaNum $length }}`,
+    },
+    {
+        name: 'env.getOrDefault',
+        template: `{{- $key := .key -}}
+{{- $default := .default | default "" -}}
+{{- $default }}`,
+    },
+    {
+        name: 'list.compact',
+        template: `{{- $list := . -}}
+{{- $result := list -}}
+{{- range $list -}}
+{{- if . -}}
+{{- $result = append $result . -}}
+{{- end -}}
+{{- end -}}
+{{- $result | toJson }}`,
+    },
+    {
+        name: 'dict.merge',
+        template: `{{- $base := .base | default dict -}}
+{{- $override := .override | default dict -}}
+{{- merge $override $base | toJson }}`,
+    },
+    {
+        name: 'date.now',
+        template: `{{- now | date "2006-01-02T15:04:05Z07:00" }}`,
+    },
+    {
+        name: 'date.format',
+        template: `{{- $format := .format | default "2006-01-02" -}}
+{{- $date := .date | default now -}}
+{{- $date | date $format }}`,
+    },
+];
+export const KUBERNETES_HELPERS = [
+    {
+        name: 'k8s.imagePullPolicy',
+        template: `{{- $tag := .tag | default .Values.image.tag -}}
+{{- if or (eq $tag "latest") (hasSuffix "-SNAPSHOT" $tag) -}}
+Always
+{{- else -}}
+IfNotPresent
+{{- end }}`,
+    },
+    {
+        name: 'k8s.resourceName',
+        template: `{{- $root := .root | default . -}}
+{{- $name := .name | default (include "chart.fullname" $root) -}}
+{{- $suffix := .suffix | default "" -}}
+{{- if $suffix -}}
+{{- printf "%s-%s" $name $suffix | trunc 63 | trimSuffix "-" -}}
+{{- else -}}
+{{- $name | trunc 63 | trimSuffix "-" -}}
+{{- end }}`,
+    },
+    {
+        name: 'k8s.annotations',
+        template: `{{- $global := .Values.global.annotations | default dict -}}
+{{- $local := .annotations | default dict -}}
+{{- $merged := merge $local $global -}}
+{{- if $merged -}}
+{{- range $key, $value := $merged }}
+{{ $key }}: {{ $value | quote }}
+{{- end -}}
+{{- end }}`,
+    },
+    {
+        name: 'k8s.labels',
+        template: `{{- $global := .Values.global.labels | default dict -}}
+{{- $local := .labels | default dict -}}
+{{- $standard := include "chart.labels" . | fromYaml -}}
+{{- $merged := merge $local $global $standard -}}
+{{- range $key, $value := $merged }}
+{{ $key }}: {{ $value | quote }}
+{{- end }}`,
+    },
+    {
+        name: 'k8s.probe',
+        template: `{{- $probe := . -}}
+{{- if $probe.enabled | default true -}}
+{{- if $probe.httpGet }}
+httpGet:
+  path: {{ $probe.httpGet.path | default "/" }}
+  port: {{ $probe.httpGet.port | default "http" }}
+  {{- if $probe.httpGet.scheme }}
+  scheme: {{ $probe.httpGet.scheme }}
+  {{- end }}
+{{- else if $probe.tcpSocket }}
+tcpSocket:
+  port: {{ $probe.tcpSocket.port | default "http" }}
+{{- else if $probe.exec }}
+exec:
+  command:
+  {{- range $probe.exec.command }}
+  - {{ . | quote }}
+  {{- end }}
+{{- end }}
+initialDelaySeconds: {{ $probe.initialDelaySeconds | default 30 }}
+periodSeconds: {{ $probe.periodSeconds | default 10 }}
+timeoutSeconds: {{ $probe.timeoutSeconds | default 5 }}
+successThreshold: {{ $probe.successThreshold | default 1 }}
+failureThreshold: {{ $probe.failureThreshold | default 3 }}
+{{- end }}`,
+    },
+];
 export const AWS_HELPERS = [
     {
         name: 'aws.region',
@@ -52,6 +249,19 @@ export const AWS_HELPERS = [
         name: 'aws.ecrRepository',
         template: `{{- printf "%s.dkr.ecr.%s.amazonaws.com/%s" (include "aws.accountId" .) (include "aws.region" .) .Values.aws.ecrRepositoryName }}`,
     },
+    {
+        name: 'aws.s3Bucket',
+        template: `{{- $region := include "aws.region" . -}}
+{{- $accountId := include "aws.accountId" . -}}
+{{- $bucketName := .bucketName | default (printf "%s-%s-%s" .Release.Name $region $accountId | lower) -}}
+{{- $bucketName | trunc 63 | trimSuffix "-" }}`,
+    },
+    {
+        name: 'aws.secretsManagerSecret',
+        template: `{{- $region := include "aws.region" . -}}
+{{- $secretName := .secretName | default (printf "%s/%s" .Release.Namespace .Release.Name) -}}
+{{- printf "arn:aws:secretsmanager:%s:%s:secret:%s" $region (include "aws.accountId" .) $secretName }}`,
+    },
 ];
 export function formatHelpers(helpers) {
     return helpers
@@ -63,17 +273,50 @@ ${helper.template}
 {{- end }}`)
         .join('\n\n');
 }
-export function getDefaultHelpers(cloudProvider) {
+export function getDefaultHelpers(cloudProvider, options) {
     const helpers = [...STANDARD_HELPERS];
+    if (options?.includeFileAccess !== false) {
+        helpers.push(...FILE_ACCESS_HELPERS);
+    }
+    if (options?.includeTemplateFunction !== false) {
+        helpers.push(...TEMPLATE_FUNCTION_HELPERS);
+    }
+    if (options?.includeSprig !== false) {
+        helpers.push(...SPRIG_HELPERS);
+    }
+    if (options?.includeKubernetes !== false) {
+        helpers.push(...KUBERNETES_HELPERS);
+    }
     if (cloudProvider === 'aws') {
         helpers.push(...AWS_HELPERS);
     }
     return helpers;
 }
-export function generateHelpersTemplate(cloudProvider, customHelpers) {
-    const helpers = getDefaultHelpers(cloudProvider);
+export function generateHelpersTemplate(cloudProvider, customHelpers, options) {
+    const helpers = getDefaultHelpers(cloudProvider, options);
     if (customHelpers) {
         helpers.push(...customHelpers);
     }
     return formatHelpers(helpers);
 }
+export function getHelpersByCategory(category) {
+    switch (category) {
+        case 'standard':
+            return [...STANDARD_HELPERS];
+        case 'fileAccess':
+            return [...FILE_ACCESS_HELPERS];
+        case 'templateFunction':
+            return [...TEMPLATE_FUNCTION_HELPERS];
+        case 'sprig':
+            return [...SPRIG_HELPERS];
+        case 'kubernetes':
+            return [...KUBERNETES_HELPERS];
+        case 'aws':
+            return [...AWS_HELPERS];
+        default:
+            return [];
+    }
+}
+export function createHelper(name, template) {
+    return { name, template };
+}

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "timonel",
   "type": "module",
-  "version": "2.8.3",
+  "version": "2.9.1",
   "description": "Timonel: programmatic Helm chart generator using cdk8s (TypeScript)",
   "bin": {
     "timonel": "dist/cli.js",
@@ -37,12 +37,9 @@
     "deps:update": "pnpm update --latest",
     "md:lint": "markdownlint \"**/*.md\"",
     "md:fix": "markdownlint --fix \"**/*.md\"",
-    "test": "pnpm test:unit && pnpm test:integration",
-    "test:unit": "vitest run --config vitest.config.ts",
-    "test:integration": "vitest run --config vitest.integration.config.ts",
+    "test:integration": "vitest run --config vitest.config.ts",
     "test:watch": "vitest",
     "test:coverage": "vitest run --coverage",
-    "test:basic-integration": "vitest run tests/integration/basic-chart-generation.int.spec.ts --config vitest.integration.config.ts",
     "ci:check": "pnpm typecheck && pnpm lint && pnpm format:check && pnpm build",
     "release": "semantic-release",
     "release:dry": "semantic-release --dry-run",
@@ -87,6 +84,8 @@
     "cdk8s": "^2.70.11",
     "cdk8s-plus-33": "^2.3.5",
     "constructs": "^10.4.2",
+    "handlebars": "^4.7.8",
+    "timonel": "^2.9.0",
     "ts-node": "^10.9.2",
     "yaml": "^2.8.1"
   },