cdk8s-cli 2.2.11 → 2.2.13

package/.backportrc.json

@@ -13,6 +13,5 @@
   "targetPRLabels": [
     "auto-approve"
   ],
-  "dir": "/tmp/.backport//repositories/cdk8s-team/cdk8s-cli",
   "//": "~~ Generated by projen. To modify, edit .projenrc.ts and run \"npx projen\"."
 }

package/.gitattributes

@@ -1,4 +1,4 @@
-# ~~ Generated by projen. To modify, edit .projenrc.js and run "npx projen".
+# ~~ Generated by projen. To modify, edit .projenrc.ts and run "npx projen".
 
 *.snap linguist-generated
 /.backportrc.json linguist-generated

package/.projenrc.ts

@@ -1,5 +1,5 @@
 import { Cdk8sTeamTypeScriptProject } from '@cdk8s/projen-common';
-import { github, JsonFile, DependencyType } from 'projen';
+import { DependencyType } from 'projen';
 import { addIntegTests } from './projenrc/integ';
 
 const project = new Cdk8sTeamTypeScriptProject({
@@ -58,6 +58,8 @@ const project = new Cdk8sTeamTypeScriptProject({
     '@types/glob',
     'typescript-json-schema',
   ],
+  backport: true,
+  backportBranches: ['1.x'],
 
 });
 
@@ -89,87 +91,6 @@ schemas.exec('ts-node scripts/crd.schema.ts');
 
 project.compileTask.spawn(schemas);
 
-// run backport in clean directories every time.
-const backportHome = '/tmp/.backport/';
-const backportDir = `${backportHome}/repositories/cdk8s-team/cdk8s-cli`;
-const backportConfig = new JsonFile(project, '.backportrc.json', {
-  // see https://github.com/sqren/backport/blob/main/docs/config-file-options.md
-  obj: {
-    repoOwner: 'cdk8s-team',
-    repoName: 'cdk8s-cli',
-    signoff: true,
-    branchLabelMapping: {
-      '^backport-to-(.+)$': '$1',
-    },
-    prTitle: '{commitMessages}',
-    fork: false,
-    publishStatusCommentOnFailure: true,
-    publishStatusCommentOnSuccess: true,
-    publishStatusCommentOnAbort: true,
-    targetPRLabels: [project.autoApprove!.label],
-    dir: backportDir,
-  },
-});
-
-// backport task to branches based on pr labels
-const backportTask = createBackportTask();
-
-// backport tasks to the explicit release branches
-for (const branch of project.release!.branches) {
-  createBackportTask(branch);
-}
-
-const backportWorkflow = project.github!.addWorkflow('backport');
-backportWorkflow.on({ pullRequestTarget: { types: ['closed'] } });
-backportWorkflow.addJob('backport', {
-  runsOn: ['ubuntu-18.04'],
-  permissions: {
-    contents: github.workflows.JobPermission.WRITE,
-  },
-  steps: [
-    // needed in order to run the projen task as well
-    // as use the backport configuration in the repo.
-    {
-      name: 'checkout',
-      uses: 'actions/checkout@v3',
-      with: {
-        // required because we need the full history
-        // for proper backports.
-        'fetch-depth': 0,
-      },
-    },
-    {
-      name: 'Set Git Identity',
-      run: 'git config --global user.name "github-actions" && git config --global user.email "github-actions@github.com"',
-    },
-    {
-      name: 'backport',
-      if: 'github.event.pull_request.merged == true',
-      run: `npx projen ${backportTask.name}`,
-      env: {
-        GITHUB_TOKEN: '${{ secrets.PROJEN_GITHUB_TOKEN }}',
-        BACKPORT_PR_NUMBER: '${{ github.event.pull_request.number }}',
-      },
-    },
-  ],
-});
-
-function createBackportTask(branch?: string) {
-  const name = branch ? `backport:${branch}` : 'backport';
-  const task = project.addTask(name, { requiredEnv: ['BACKPORT_PR_NUMBER', 'GITHUB_TOKEN'] });
-  task.exec(`rm -rf ${backportHome}`);
-  task.exec(`mkdir -p ${backportHome}`);
-  task.exec(`cp ${backportConfig.path} ${backportHome}`);
-
-  const command = ['npx', 'backport', '--accesstoken', '${GITHUB_TOKEN}', '--pr', '${BACKPORT_PR_NUMBER}'];
-  if (branch) {
-    command.push(...['--branch', branch]);
-  } else {
-    command.push('--non-interactive');
-  }
-  task.exec(command.join(' '), { cwd: backportHome });
-  return task;
-}
 
 addIntegTests(project);
 

package/package.json

@@ -11,7 +11,6 @@
   "scripts": {
     "backport": "npx projen backport",
     "backport:1.x": "npx projen backport:1.x",
-    "backport:2.x": "npx projen backport:2.x",
     "build": "npx projen build",
     "bump": "npx projen bump",
     "clobber": "npx projen clobber",
@@ -43,7 +42,7 @@
     "organization": false
   },
   "devDependencies": {
-    "@cdk8s/projen-common": "^0.0.309",
+    "@cdk8s/projen-common": "^0.0.312",
     "@types/fs-extra": "^8",
     "@types/glob": "^7.2.0",
     "@types/jest": "^27",
@@ -59,7 +58,7 @@
     "jest": "^27",
     "jest-junit": "^15",
     "npm-check-updates": "^16",
-    "projen": "^0.70.6",
+    "projen": "^0.71.15",
     "standard-version": "^9",
     "ts-jest": "^27",
     "ts-node": "^10.9.1",
@@ -69,16 +68,16 @@
   "dependencies": {
     "@types/node": "^14",
     "ajv": "^8.12.0",
-    "cdk8s": "^2.7.52",
-    "cdk8s-plus-25": "^2.6.18",
-    "codemaker": "^1.79.0",
+    "cdk8s": "^2.7.55",
+    "cdk8s-plus-25": "^2.7.0",
+    "codemaker": "^1.80.0",
     "colors": "1.4.0",
-    "constructs": "^10.1.299",
+    "constructs": "^10.1.314",
     "fs-extra": "^8",
-    "jsii-pacmak": "^1.79.0",
-    "jsii-srcmak": "^0.1.871",
-    "json2jsii": "^0.3.323",
-    "semver": "^7.3.8",
+    "jsii-pacmak": "^1.80.0",
+    "jsii-srcmak": "^0.1.885",
+    "json2jsii": "^0.3.325",
+    "semver": "^7.5.0",
     "sscaff": "^1.2.274",
     "table": "^6.8.1",
     "yaml": "2.2.1",
@@ -97,7 +96,7 @@
     "node": ">= 14.17.0"
   },
   "license": "Apache-2.0",
-  "version": "2.2.11",
+  "version": "2.2.13",
   "jest": {
     "testMatch": [
       "<rootDir>/src/**/__tests__/**/*.ts?(x)",
@@ -140,9 +139,12 @@
       }
     }
   },
+  "optionalDependencies": {
+    "backport": "8.5.0"
+  },
   "exports": {
     "./plugins": "./lib/plugins/index.js",
     "./package.json": "./package.json"
   },
-  "//": "~~ Generated by projen. To modify, edit .projenrc.js and run \"npx projen\"."
+  "//": "~~ Generated by projen. To modify, edit .projenrc.ts and run \"npx projen\"."
 }