@turboops/cli 1.0.0-dev.611 → 1.0.0-dev.613

package/dist/index.js

@@ -2226,23 +2226,62 @@ Modifiziere die Datei "${pipelineFile}" entsprechend.` : `Erstelle eine neue ${p
 Projekt-Slug: ${projectSlug}
 Pipeline-Datei: ${pipelineFile}
 
-Erstelle eine Standard-Pipeline mit:
-1. Build-Stage: Docker Image bauen und pushen
-2. Deploy-Stages f\xFCr jede Umgebung (dev, test, prod)
-
-Jede Stage deployed nur auf ihrem Branch (dev->dev, test->test, main->prod).
-
-Verwende:
-- Image: docker:24-dind f\xFCr Build
-- Image: node:20-alpine f\xFCr Deploy
-- Registry: registry.turbo-ops.de/${projectSlug}
-- TurboOps CLI: npm install -g @turboops/cli
-
-Befehle:
-- turbo config set token \${TURBOOPS_TOKEN}
-- turbo deploy <stage-slug> --image <image-tag> --wait
-
-Secrets ben\xF6tigt: TURBOOPS_TOKEN
+WICHTIG - Branch-zu-Stage-Zuordnung (STRIKT EINHALTEN!):
+- dev Stage \u2192 deployed NUR wenn Branch == "dev"
+- test Stage \u2192 deployed NUR wenn Branch == "test"
+- prod Stage \u2192 deployed NUR wenn Branch == "main"
+
+PIPELINE-STRUKTUR:
+
+1. BUILD-JOB (l\xE4uft auf ALLEN Branches: dev, test, main):
+   stages: [build, deploy-dev, deploy-test, deploy-prod]
+
+   build:
+     image: docker:24-dind
+     services: [docker:24-dind]
+     before_script:
+       - docker login -u ${projectSlug} -p \${TURBOOPS_TOKEN} registry.turbo-ops.de
+     script:
+       - docker compose build
+       - docker compose push
+     rules:
+       - if: $CI_COMMIT_BRANCH  # L\xE4uft auf ALLEN Branches!
+
+2. DEPLOY-JOBS (jeder NUR auf seinem Branch!):
+   WICHTIG: KEIN --image Flag n\xF6tig! Die CLI erkennt CI_COMMIT_SHA automatisch!
+
+   deploy-dev:
+     image: node:20-alpine
+     before_script:
+       - npm install -g @turboops/cli
+       - turbo config set token \${TURBOOPS_TOKEN}
+     script:
+       - turbo deploy dev --wait  # CLI erkennt Image automatisch via CI_COMMIT_SHA
+     rules:
+       - if: $CI_COMMIT_BRANCH == "dev"  # NUR auf dev Branch!
+     needs: [build]
+
+   deploy-test:
+     script:
+       - turbo deploy test --wait
+     rules:
+       - if: $CI_COMMIT_BRANCH == "test"  # NUR auf test Branch!
+     needs: [deploy-dev]
+
+   deploy-prod:
+     script:
+       - turbo deploy prod --wait
+     rules:
+       - if: $CI_COMMIT_BRANCH == "main"  # NUR auf main Branch!
+         when: manual
+     needs: [deploy-test]
+
+WICHTIG:
+- Der Build l\xE4uft auf ALLEN Branches (dev, test, main)
+- Jeder Deploy-Job l\xE4uft NUR auf seinem zugeordneten Branch
+- KEIN --image Flag n\xF6tig - CLI erkennt CI_COMMIT_SHA/GITHUB_SHA automatisch
+- Registry-URL: registry.turbo-ops.de/${projectSlug}
+- Secrets ben\xF6tigt: TURBOOPS_TOKEN
 
 Erstelle die Datei "${pipelineFile}".`;
   const success = await aiToolsService.runWithPrompt(tool, prompt, verbose);
@@ -2264,17 +2303,58 @@ Erstelle die Datei "${pipelineFile}".`;
 // src/commands/deploy.ts
 import { Command as Command4 } from "commander";
 import chalk6 from "chalk";
-var deployCommand = new Command4("deploy").description("Trigger a deployment (for CI/CD pipelines)").argument("<environment>", "Environment slug (e.g., production, staging)").option("-i, --image <tag>", "Docker image tag to deploy").option("-w, --wait", "Wait for deployment to complete", true).option("--no-wait", "Do not wait for deployment to complete").option(
+var REGISTRY_URL = "registry.turbo-ops.de";
+function detectCiCommitSha() {
+  if (process.env.CI_COMMIT_SHA) {
+    return process.env.CI_COMMIT_SHA;
+  }
+  if (process.env.GITHUB_SHA) {
+    return process.env.GITHUB_SHA;
+  }
+  if (process.env.BITBUCKET_COMMIT) {
+    return process.env.BITBUCKET_COMMIT;
+  }
+  if (process.env.BUILD_SOURCEVERSION) {
+    return process.env.BUILD_SOURCEVERSION;
+  }
+  if (process.env.CIRCLE_SHA1) {
+    return process.env.CIRCLE_SHA1;
+  }
+  if (process.env.GIT_COMMIT) {
+    return process.env.GIT_COMMIT;
+  }
+  return null;
+}
+function detectCiEnvironment() {
+  if (process.env.GITLAB_CI) return "GitLab CI";
+  if (process.env.GITHUB_ACTIONS) return "GitHub Actions";
+  if (process.env.BITBUCKET_PIPELINES) return "Bitbucket Pipelines";
+  if (process.env.TF_BUILD) return "Azure DevOps";
+  if (process.env.CIRCLECI) return "CircleCI";
+  if (process.env.JENKINS_URL) return "Jenkins";
+  return null;
+}
+var deployCommand = new Command4("deploy").description("Trigger a deployment (for CI/CD pipelines)").argument("<environment>", "Environment slug (e.g., production, staging)").option("-i, --image <tag>", "Docker image tag to deploy (auto-detected in CI/CD)").option("-w, --wait", "Wait for deployment to complete", true).option("--no-wait", "Do not wait for deployment to complete").option(
   "--timeout <ms>",
   "Timeout in milliseconds when waiting",
   "600000"
 ).action(async (environment, options) => {
   const { project, environment: env } = await getCommandContextWithEnvironment(environment);
   logger.header(`Deploying: ${project.name} \u2192 ${env.name}`);
+  let imageTag = options.image;
+  if (!imageTag) {
+    const commitSha = detectCiCommitSha();
+    const ciEnv = detectCiEnvironment();
+    if (commitSha && ciEnv) {
+      imageTag = `${REGISTRY_URL}/${project.slug}:${commitSha}`;
+      logger.info(`CI/CD detected (${ciEnv})`);
+      logger.info(`Auto-using image: ${imageTag}`);
+    }
+  }
   logger.info("Triggering deployment...");
   const { data: deployment, error } = await apiClient.deploy(
     env.id,
-    options.image
+    imageTag
   );
   if (error) {
     logger.error(`Failed to trigger deployment: ${error}`);
@@ -2290,7 +2370,7 @@ var deployCommand = new Command4("deploy").description("Trigger a deployment (fo
     status: deployment.status,
     environment: env.slug,
     project: project.slug,
-    imageTag: options.image || "latest"
+    imageTag: imageTag || "auto-promotion"
   });
   if (!options.wait) {
     logger.info("Deployment started. Use --wait to wait for completion.");
@@ -2581,17 +2661,36 @@ async function integratePipelineWithAI2(pipelineType, projectSlug, pipelinePath)
 Projekt-Slug: ${projectSlug}
 Pipeline-Datei: ${pipelinePath}
 
-Anforderungen:
-1. Die bestehende Pipeline-Struktur beibehalten
-2. Einen neuen Deploy-Job/Step hinzuf\xFCgen der nach dem Build l\xE4uft
-3. TurboOps CLI installieren: npm install -g @turboops/cli
-4. Token setzen: turbo config set token \${TURBOOPS_TOKEN}
-5. Deploy ausf\xFChren: turbo deploy <environment> --image <image-tag> --wait
+WICHTIG - Branch-zu-Stage-Zuordnung:
+- dev Stage \u2192 wird NUR auf dem "dev" Branch deployed
+- test Stage \u2192 wird NUR auf dem "test" Branch deployed
+- prod Stage \u2192 wird NUR auf dem "main" Branch deployed
 
-Die erste Stage braucht --image, weitere Stages k\xF6nnen ohne --image deployen (Auto-Promotion).
+PIPELINE-STRUKTUR:
+1. Build-Job: L\xE4uft auf ALLEN Branches (dev, test, main)
+   - Docker Images bauen mit docker-compose build
+   - Images pushen mit docker-compose push
+   - Registry: registry.turbo-ops.de/${projectSlug}
+   - Image-Tag: \${CI_COMMIT_SHA} (wird automatisch von CLI erkannt)
 
-Secrets die ben\xF6tigt werden:
-- TURBOOPS_TOKEN: TurboOps Projekt-Token
+2. Deploy-Jobs: Jeder Job l\xE4uft NUR auf seinem Branch!
+   - deploy-dev: rules: if: $CI_COMMIT_BRANCH == "dev"
+   - deploy-test: rules: if: $CI_COMMIT_BRANCH == "test"
+   - deploy-prod: rules: if: $CI_COMMIT_BRANCH == "main" (when: manual)
+
+DEPLOY-BEFEHLE (WICHTIG: KEIN --image Flag n\xF6tig!):
+- TurboOps CLI installieren: npm install -g @turboops/cli
+- Token setzen: turbo config set token \${TURBOOPS_TOKEN}
+- Deploy: turbo deploy <stage> --wait
+
+Die CLI erkennt automatisch CI_COMMIT_SHA/GITHUB_SHA und verwendet das richtige Image!
+
+DEPENDENCIES:
+- deploy-dev needs: [build]
+- deploy-test needs: [deploy-dev]
+- deploy-prod needs: [deploy-test]
+
+Secrets ben\xF6tigt: TURBOOPS_TOKEN
 
 Modifiziere die Datei "${pipelinePath}" entsprechend.`;
   const success = await aiToolsService.runWithPrompt(tool, prompt);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@turboops/cli",
-  "version": "1.0.0-dev.611",
+  "version": "1.0.0-dev.613",
   "description": "TurboCLI - Command line interface for TurboOps deployments",
   "author": "lenne.tech GmbH",
   "license": "MIT",