From a70bceb6022fcad08b35eb6742c24e1223f57c93 Mon Sep 17 00:00:00 2001
From: Niranjan Jayakar <nija@amazon.com>
Date: Wed, 11 Nov 2020 12:39:46 +0000
Subject: [PATCH] chore(pkglint): rule to ensure that only allowed packages are
 public (#11317)

In the v2 branch, most packages are private except a handful. Update the
pkglint rule to carry an allowlist on the set of packages that should be
private.

Prevents accidentally publishing new packages.

----

*By submitting this pull request, I confirm that my contribution is made under the terms of the Apache-2.0 license*
---
 tools/pkglint/lib/rules.ts | 45 +++++++++++++++++++++++++++-----------
 1 file changed, 32 insertions(+), 13 deletions(-)

diff --git a/tools/pkglint/lib/rules.ts b/tools/pkglint/lib/rules.ts
index b3ae82fce7160..c669ce1efef31 100644
--- a/tools/pkglint/lib/rules.ts
+++ b/tools/pkglint/lib/rules.ts
@@ -1460,24 +1460,43 @@ export class JestSetup extends ValidationRule {
 
 export class UbergenPackageVisibility extends ValidationRule {
   public readonly name = 'ubergen/package-visibility';
+  private readonly publicPackages = ['aws-cdk-lib', 'cdk', 'aws-cdk', 'awslint'];
 
   public validate(pkg: PackageJson): void {
     // eslint-disable-next-line @typescript-eslint/no-require-imports
     const releaseJson = require(`${__dirname}/../../../release.json`);
     if (releaseJson.majorVersion === 2) {
-      // skip in v2 for now
-      return;
-    }
-    if (pkg.json.private && !pkg.json.ubergen?.exclude) {
-      pkg.report({
-        ruleName: this.name,
-        message: 'ubergen.exclude must be configured for private packages',
-        fix: () => {
-          pkg.json.ubergen = {
-            exclude: true,
-          };
-        },
-      });
+      // Only packages in the publicPackages list should be "public". Everything else should be private.
+      if (this.publicPackages.includes(pkg.json.name) && pkg.json.private === true) {
+        pkg.report({
+          ruleName: this.name,
+          message: 'Package must be public',
+          fix: () => {
+            delete pkg.json.private;
+          },
+        });
+      } else if (!this.publicPackages.includes(pkg.json.name) && pkg.json.private !== true) {
+        pkg.report({
+          ruleName: this.name,
+          message: 'Package must not be public',
+          fix: () => {
+            delete pkg.json.private;
+            pkg.json.private = true;
+          },
+        });
+      }
+    } else {
+      if (pkg.json.private && !pkg.json.ubergen?.exclude) {
+        pkg.report({
+          ruleName: this.name,
+          message: 'ubergen.exclude must be configured for private packages',
+          fix: () => {
+            pkg.json.ubergen = {
+              exclude: true,
+            };
+          },
+        });
+      }
     }
   }
 }