fix : blueprint-builder homepage population (#596)

Co-authored-by: Pranav Dogra <prandog@amazon.com>
aws · Jul 25, 2024 · 008f176 · 008f176
1 parent a17772e
commit 008f176
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 17 deletions.
diff --git a/packages/blueprints/blueprint-builder/src/blueprint.ts b/packages/blueprints/blueprint-builder/src/blueprint.ts
@@ -32,8 +32,6 @@ export interface Options extends ParentOptions {
    */
   authorName: string;
 
-  homepage: string;
-
   /**
    * @collapsed true
    */
@@ -99,7 +97,6 @@ export class Blueprint extends ParentBlueprint {
         ...defaults.advancedSettings,
         license: defaults.advancedSettings.license as any,
       },
-      homepage: 'https://codecatalyst.aws/',
     };
     const userSelectedOptions = Object.assign(typeCheck, options_);
 
@@ -135,7 +132,6 @@ export class Blueprint extends ParentBlueprint {
       space: this.context.spaceName || 'unknown',
       packageName: options.advancedSettings.blueprintPackageName,
       dashname: dashName,
-      homepage: options.homepage,
       projectName: this.context.project.name || 'unknown',
       spaceName: this.context.spaceName || 'unknown',
     });

diff --git a/packages/blueprints/blueprint-builder/src/build-blueprint-package.ts b/packages/blueprints/blueprint-builder/src/build-blueprint-package.ts
@@ -27,7 +27,6 @@ export function buildBlueprintPackage(
     packageName: string;
     dashname: string;
     bpOptions: Options;
-    homepage: string;
     projectName: string;
     spaceName: string;
   },
@@ -37,15 +36,10 @@ export function buildBlueprintPackage(
   });
 
   const newBlueprintOptions: ProjenBlueprintOptions = {
-    homepage: options.homepage.concat(
-      '/spaces/',
-      options.space,
-      '/projects/',
-      options.projectName,
-      '/source-repositories/',
-      options.dashname,
-      '/view',
-    ),
+    homepage:
+      options.projectName !== '<<FAKE_PROJECTNAME>>' && options.space !== '<<FAKE_SPACENAME>>'
+        ? `https://codecatalyst.aws/spaces/${options.space}/projects/${options.projectName}/source-repositories/${options.dashname}/view`
+        : 'https://codecatalyst.aws',
     authorName: options.bpOptions.authorName,
     publishingOrganization: options.space,
     packageName: options.packageName,

diff --git a/packages/utils/projen-blueprint/src/blueprint.ts b/packages/utils/projen-blueprint/src/blueprint.ts
@@ -107,9 +107,11 @@ export class ProjenBlueprint extends typescript.TypeScriptProject {
     };
     super(finalOpts);
 
-    this.addFields({
-      homepage: 'https://codecatalyst.aws/',
-    });
+    if (!finalOpts.homepage) {
+      this.addFields({
+        homepage: 'https://codecatalyst.aws/',
+      });
+    }
 
     const version = options.overridePackageVersion || JSON.parse(fs.readFileSync(path.resolve(this.outdir, 'package.json'), 'utf-8')).version;
     this.package.addVersion(version || '0.0.0');