Merge pull request #3180 from Zemnmez/pr3180

Introduce my own pulumi Website component. I didn't want to have to do this, but have had to becuase of https://github.c

deploy/BUILD.bazel

@@ -16,14 +16,14 @@ ts_project(
         "//project/ck3/recursive-vassals:mod_zip",
         "//project/ck3/recursive-vassals:patch",
         "//ts/cmd/svgshot:npm_pkg.publish",
-        "//ts/cmd/svgshot:package.json",
         "//ts/cmd/svgshot:npm_pkg.tgz",
+        "//ts/cmd/svgshot:package.json",
         "//ts/do-sync:npm_pkg.publish",
-        "//ts/do-sync:package.json",
         "//ts/do-sync:npm_pkg.tgz",
+        "//ts/do-sync:package.json",
         "//ts/knowitwhenyouseeit:npm_pkg.publish",
-        "//ts/knowitwhenyouseeit:package.json",
         "//ts/knowitwhenyouseeit:npm_pkg.tgz",
+        "//ts/knowitwhenyouseeit:package.json",
     ],
     deps = [
         "//:node_modules/@actions/github",

package.json

@@ -104,7 +104,6 @@
 	},
 	"dependencies": {
 		"@commander-js/extra-typings": "^10.0.3",
-		"@pulumi/aws-static-website": "^0.4.0",
 		"@pulumi/command": "4.5.0",
 		"@types/bcryptjs": "2.4.2",
 		"csstype": "^3.1.1",

ts/guard.ts

@@ -10,9 +10,15 @@ export function isNotNull<T>(i: T | null): i is T {
 	return i !== null;
 }
 
-export function must<I, O extends I>(f: (v: I) => v is O): (v: I) => O {
+export function must<I, O extends I>(
+	f: (v: I) => v is O,
+	message?: () => string
+): (v: I) => O {
 	return v => {
-		if (!f(v)) throw new Error(`${v} not ${f.name}`);
+		if (!f(v))
+			throw new Error(
+				`${v} not ${f.name} ${message ? `(${message()})` : ''}`
+			);
 		return v;
 	};
 }

ts/pulumi/dog/pleaseintroducemetoyour/BUILD.bazel

@@ -6,22 +6,11 @@ ts_project(
     name = "pleaseintroducemetoyour",
     srcs = ["index.ts"],
     deps = [
-        ":cert",
         ":zone",
         "//ts/pulumi/dog/pleaseintroducemetoyour/public",
     ],
 )
 
-ts_project(
-    name = "cert",
-    srcs = ["cert.ts"],
-    deps = [
-        ":zone",
-        "//:node_modules/@pulumi/aws",
-        "//:node_modules/@pulumi/pulumi",
-    ],
-)
-
 ts_project(
     name = "zone",
     srcs = ["zone.ts"],

ts/pulumi/dog/pleaseintroducemetoyour/index.ts

@@ -1,3 +1,2 @@
-export * from 'ts/pulumi/dog/pleaseintroducemetoyour/cert';
 export * as Public from 'ts/pulumi/dog/pleaseintroducemetoyour/public';
 export * from 'ts/pulumi/dog/pleaseintroducemetoyour/zone';

ts/pulumi/dog/pleaseintroducemetoyour/public/BUILD.bazel

@@ -6,8 +6,8 @@ ts_project(
     name = "public",
     data = ["//ts/pulumi/dog/pleaseintroducemetoyour/public/static"],
     deps = [
-        "//:node_modules/@pulumi/aws-static-website",
         "//:node_modules/@pulumi/pulumi",
-        "//ts/pulumi/dog/pleaseintroducemetoyour:cert",
+        "//ts/pulumi/dog/pleaseintroducemetoyour:zone",
+        "//ts/pulumi/lib",
     ],
 )

ts/pulumi/dog/pleaseintroducemetoyour/public/index.ts

@@ -1,16 +1,11 @@
-import * as staticwebsite from '@pulumi/aws-static-website';
-import * as asset from '@pulumi/pulumi/asset';
-import * as cert from 'ts/pulumi/dog/pleaseintroducemetoyour/cert';
+import * as zone from 'ts/pulumi/dog/pleaseintroducemetoyour/zone';
+import Website from 'ts/pulumi/lib/website';
 
-export const site = new staticwebsite.Website('pleaseintroducemetoyour.dog', {
-	withCDN: true,
-	indexHTML: new asset.FileAsset(
-		'ts/pulumi/dog/pleaseintroducmetoyour/public/static/out/index.html'
-	).path,
-	error404: new asset.FileAsset(
-		'ts/pulumi/dog/pleaseintroducemetoyour/public/static/out/404.html'
-	).path,
-	sitePath: 'ts/pulumi/dog/pleaseintroducemetoyour/public/static/out',
-	targetDomain: 'pleaseintroducemetoyour.dog',
-	certificateARN: cert.arn,
+export const site = new Website('pleaseintroducemetoyour.dog', {
+	index: 'ts/pulumi/dog/pleaseintroducemetoyour/public/static/out/index.html',
+	notFound:
+		'ts/pulumi/dog/pleaseintroducemetoyour/public/static/out/404.html',
+	directory: 'ts/pulumi/dog/pleaseintroducemetoyour/public/static/out',
+	zone: zone.zone,
+	subDomain: undefined,
 });

ts/pulumi/im/shadwell/BUILD.bazel

@@ -6,7 +6,6 @@ ts_project(
     name = "shadwell",
     deps = [
         "//:node_modules/@pulumi/aws",
-        "//ts/pulumi/im/shadwell/cert",
         "//ts/pulumi/im/shadwell/thomas",
         "//ts/pulumi/im/shadwell/zone",
     ],