Merge pull request #3 from TouK/dev

JulianWielga · web-flow · commit 478ea4506c0c · 2026-02-18T14:51:24.000+01:00
release
diff --git a/cli/.gitignore b/cli/.gitignore
@@ -5,7 +5,7 @@ node_modules/
 dist/
 
 # Config files (contains secrets)
-.nu-cli.yaml
+nu-config.yaml
 *.yaml
 !src/templates/*.yaml.template
 
diff --git a/cli/.npmignore b/cli/.npmignore
@@ -18,7 +18,7 @@ coverage/
 # Config files
 .env
 .env.*
-.nu-cli.yaml
+nu-config.yaml
 
 # CI/CD
 .github/
diff --git a/cli/.releaserc.json b/cli/.releaserc.json
@@ -3,6 +3,7 @@
     "master",
     {
       "name": "dev",
+      "channel": "beta",
       "prerelease": "beta"
     }
   ],
diff --git a/cli/CHANGELOG.md b/cli/CHANGELOG.md
@@ -1,3 +1,16 @@
+## [1.0.1-beta.2](https://github.com/TouK/nu-cloud-lab/compare/v1.0.1-beta.1...v1.0.1-beta.2) (2026-02-18)
+
+### Bug Fixes
+
+* trigger build ([023352e](https://github.com/TouK/nu-cloud-lab/commit/023352e9b94d399c72e54d3c4bf0c0b0ad6833a2))
+
+## [1.0.1-beta.1](https://github.com/TouK/nu-cloud-lab/compare/v1.0.0...v1.0.1-beta.1) (2026-02-18)
+
+### Bug Fixes
+
+* beta tag fixed ([a55f07b](https://github.com/TouK/nu-cloud-lab/commit/a55f07b18a84dfccfcc2e6c6faa4449ceed40921))
+* config and message template ([3e93efc](https://github.com/TouK/nu-cloud-lab/commit/3e93efcc2e602e94810a4421dde108647087ded7))
+
 ## 1.0.0 (2026-02-18)
 
 ### Bug Fixes
diff --git a/cli/README.md b/cli/README.md
@@ -52,6 +52,10 @@ nu-cli init --no-interactive   # Use template
 nu-cli init -o myconfig.yaml   # Custom output path
 ```
 
+**Creates:**
+- `nu-config.yaml` - Configuration file
+- `message-template.yaml` - Default message template
+
 **Interactive prompts:**
 - Nu Cloud API URL
 - Username
@@ -82,7 +86,7 @@ nu-cli send --profile production --data '{"event": "user_login"}'
 **Priority:** `--data` > `--file` > `--template` > config template > default template
 
 **Options:**
-- `-C, --config <path>` - Config file path (default: `.nu-cli.yaml`)
+- `-C, --config <path>` - Config file path (default: `nu-config.yaml`)
 - `-p, --profile <name>` - Config profile to use
 - `-d, --data <json>` - Message data as JSON/YAML string
 - `-f, --file <path>` - Message data from file (JSON/YAML)
@@ -104,7 +108,7 @@ nu-cli produce --template custom.yaml  # Use custom template
 ```
 
 **Options:**
-- `-C, --config <path>` - Config file path (default: `.nu-cli.yaml`)
+- `-C, --config <path>` - Config file path (default: `nu-config.yaml`)
 - `-p, --profile <name>` - Config profile to use
 - `-d, --delay <seconds>` - Delay between messages (overrides config)
 - `-t, --template <path>` - Template file to use (overrides config)
@@ -213,7 +217,7 @@ nu-cli schema -o schema.avsc   # Save to file
 
 ## Configuration
 
-### Basic config (`.nu-cli.yaml`)
+### Basic config (`nu-config.yaml`)
 
 ```yaml
 api:
@@ -223,7 +227,7 @@ api:
 
 producer:
   delay_seconds: 1
-  # template_path: "./custom-template.yaml"  # Optional: custom message template
+  template_path: "./message-template.yaml"  # Path to message template (created by init)
 ```
 
 **Optional Authentication:**  
@@ -295,7 +299,7 @@ price: "faker:commerce.price(10,1000)"
 **Use it:**
 
 ```bash
-# In .nu-cli.yaml
+# In nu-config.yaml
 producer:
   template_path: "./my-template.yaml"
 
@@ -449,7 +453,7 @@ nu-cli consume --no-tunnel
 Run `nu-cli init` to create a config file, or specify a custom path with `--config`.
 
 ### "Invalid or placeholder password"
-Edit your `.nu-cli.yaml` and set a real password (not `your_password`).
+Edit your `nu-config.yaml` and set a real password (not `your_password`).
 
 ### "cloudflared not found"
 Install cloudflared or use `--no-tunnel` flag:
diff --git a/cli/package-lock.json b/cli/package-lock.json
diff --git a/cli/package.json b/cli/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@nussknacker/cli",
-  "version": "1.0.0",
+  "version": "1.0.1-beta.2",
   "description": "CLI tool for Nussknacker Cloud - produce and consume messages",
   "type": "module",
   "bin": {
diff --git a/cli/src/commands/init.ts b/cli/src/commands/init.ts
@@ -15,7 +15,7 @@ export const initCommand = new Command('init')
   .description('Initialize configuration file')
   .option('-i, --interactive', 'Interactive mode (default)', true)
   .option('--no-interactive', 'Non-interactive mode (use template)')
-  .option('-o, --output <path>', 'Output file path', '.nu-cli.yaml')
+  .option('-o, --output <path>', 'Output file path', 'nu-config.yaml')
   .action(async (options) => {
     try {
       let config: NuCloudConfig;
@@ -62,7 +62,8 @@ export const initCommand = new Command('init')
             password: answers.password
           },
           producer: {
-            delay_seconds: answers.delay
+            delay_seconds: answers.delay,
+            template_path: './message-template.yaml'
           }
         };
 
@@ -81,6 +82,17 @@ export const initCommand = new Command('init')
       const outputPath = path.resolve(options.output);
       await fs.writeFile(outputPath, yaml.stringify(config), 'utf-8');
 
+      // Copy message template next to config
+      const messageTemplateSrc = path.join(__dirname, 'message-template.yaml.template');
+      const messageTemplateDst = path.join(path.dirname(outputPath), 'message-template.yaml');
+
+      try {
+        await fs.copyFile(messageTemplateSrc, messageTemplateDst);
+        logger.success(`Message template created: ${messageTemplateDst}`);
+      } catch (error) {
+        logger.warn('Could not copy message template - using built-in default');
+      }
+
       logger.success(`Configuration file created: ${outputPath}`);
 
       if (!options.interactive) {
diff --git a/cli/src/commands/produce.ts b/cli/src/commands/produce.ts
@@ -7,7 +7,7 @@ import { logger } from '../utils/logger.js';
 
 export const produceCommand = new Command('produce')
   .description('Send messages to Nu Cloud continuously')
-  .option('-C, --config <path>', 'Config file path', '.nu-cli.yaml')
+  .option('-C, --config <path>', 'Config file path', 'nu-config.yaml')
   .option('-p, --profile <name>', 'Config profile to use')
   .option('-d, --delay <seconds>', 'Delay between messages (overrides config)', parseFloat)
   .option('-t, --template <path>', 'Template file to use (overrides config)')
diff --git a/cli/src/commands/schema.ts b/cli/src/commands/schema.ts
@@ -8,7 +8,7 @@ import { logger } from '../utils/logger.js';
 
 export const schemaCommand = new Command('schema')
   .description('Generate Avro schema from message template')
-  .option('-C, --config <path>', 'Config file path', '.nu-cli.yaml')
+  .option('-C, --config <path>', 'Config file path', 'nu-config.yaml')
   .option('-p, --profile <name>', 'Config profile to use')
   .option('-t, --template <path>', 'Template file to use (overrides config)')
   .option('-o, --output <path>', 'Output file (stdout if not specified)')
diff --git a/cli/src/commands/send.ts b/cli/src/commands/send.ts
@@ -7,7 +7,7 @@ import { logger } from '../utils/logger.js';
 
 export const sendCommand = new Command('send')
   .description('Send a single message to Nu Cloud')
-  .option('-C, --config <path>', 'Config file path', '.nu-cli.yaml')
+  .option('-C, --config <path>', 'Config file path', 'nu-config.yaml')
   .option('-p, --profile <name>', 'Config profile to use')
   .option('-d, --data <json>', 'Message data as JSON/YAML string')
   .option('-f, --file <path>', 'Message data from file (JSON/YAML)')
diff --git a/cli/src/lib/config/loader.ts b/cli/src/lib/config/loader.ts
@@ -9,7 +9,7 @@ export async function loadConfig(
   configPath?: string,
   profileName?: string
 ): Promise<NuCloudConfig> {
-  const resolvedPath = configPath || path.join(process.cwd(), '.nu-cli.yaml');
+  const resolvedPath = configPath || path.join(process.cwd(), 'nu-config.yaml');
 
   try {
     const content = await fs.readFile(resolvedPath, 'utf-8');
diff --git a/cli/src/lib/template/generator.ts b/cli/src/lib/template/generator.ts
@@ -17,20 +17,20 @@ export const MESSAGE_TEMPLATE: TemplateObject = {
 
 /**
  * Load template from file or use default
- * 
+ *
  * Priority:
  *   1. Provided path (parameter)
- *   2. Default template (message-template.yaml)
+ *   2. Default template from dist/ (message-template.yaml.template)
  */
 export async function loadTemplate(templatePath?: string): Promise<TemplateObject> {
   if (templatePath) {
     // User-provided path (relative to CWD)
     const resolved = path.resolve(templatePath);
     return await parseFile(resolved);
   }
-  
-  // Default template (bundled with CLI - publicDir copies to dist/)
-  const defaultPath = path.join(__dirname, 'message-template.yaml');
+
+  // Fall back to bundled template
+  const defaultPath = path.join(__dirname, 'message-template.yaml.template');
   return await parseFile(defaultPath);
 }
 
diff --git a/cli/src/templates/config.yaml.template b/cli/src/templates/config.yaml.template
@@ -7,7 +7,7 @@ api:
 # Producer Configuration
 producer:
   delay_seconds: 1
-  # template_path: "./custom-template.yaml"  # Optional: path to custom message template
+  template_path: "./message-template.yaml"  # Path to message template (created by init)
 
 # Optional: Multiple profiles (dev/staging/prod)
 # profiles:
diff --git a/cli/src/templates/message-template.yaml.template b/cli/src/templates/message-template.yaml.template
@@ -0,0 +1,27 @@
+# Default message template for Nu Cloud
+# 
+# This template demonstrates faker.js syntax for generating random test data.
+# Full API reference: https://fakerjs.dev/api/
+#
+# Syntax:
+#   faker:category.method           -> faker.person.fullName()
+#   faker:category.method(params)   -> faker.number.int(18,65)
+#
+# Legacy syntax (still supported):
+#   random_name                     -> Random name from built-in list
+#   random_int(min,max)             -> Random integer
+#   current_timestamp               -> ISO 8601 timestamp
+
+name: "faker:person.fullName"
+email: "faker:internet.email"
+age: "faker:number.int(18,65)"
+timestamp: "current_timestamp"
+
+# More examples (commented out):
+# company: "faker:company.name"
+# address: "faker:location.streetAddress"
+# city: "faker:location.city"
+# phone: "faker:phone.number"
+# uuid: "faker:string.uuid"
+# productName: "faker:commerce.productName"
+# price: "faker:commerce.price(10,1000)"

Original file line number	Diff line number	Diff line change
`@@ -3,6 +3,7 @@`
`3`	`3`	`"master",`
`4`	`4`	`{`
`5`	`5`	`"name": "dev",`
	`6`	`+ "channel": "beta",`
`6`	`7`	`"prerelease": "beta"`
`7`	`8`	`}`
`8`	`9`	`],`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "@nussknacker/cli",`
`3`		`- "version": "1.0.0",`
	`3`	`+ "version": "1.0.1-beta.2",`
`4`	`4`	`"description": "CLI tool for Nussknacker Cloud - produce and consume messages",`
`5`	`5`	`"type": "module",`
`6`	`6`	`"bin": {`