[build] Use build sha instead of build number for CDN assets (elastic…

…#176186) elastic#175898 updates routes to cache bust using the build checksum instead of build number. This updates the directory structure of the CDN assets archive accordingly. ``` kibana-8.13.0-SNAPSHOT-cdn-assets └── e96cc06 ├── bundles │ ├── core │ ├── kbn-monaco │ ├── kbn-ui-shared-deps-npm │ ├── kbn-ui-shared-deps-src │ └── plugin └── ui ├── favicons ├── fonts ├── legacy_dark_theme.css ├── legacy_dark_theme.min.css ├── legacy_light_theme.css └── legacy_light_theme.min.css 11 directories, 4 files ```
CoenWarmer · Feb 15, 2024 · bf07f0d · bf07f0d
1 parent f2b6caa
commit bf07f0d
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 3 deletions.
diff --git a/src/dev/build/lib/build.test.ts b/src/dev/build/lib/build.test.ts
@@ -30,6 +30,7 @@ const config = new Config(
   {
     buildNumber: 1234,
     buildSha: 'abcd1234',
+    buildShaShort: 'abcd',
     buildVersion: '8.0.0',
     buildDate: '2023-05-15T23:12:09+0000',
   },

diff --git a/src/dev/build/lib/config.ts b/src/dev/build/lib/config.ts
@@ -228,6 +228,13 @@ export class Config {
     return this.versionInfo.buildSha;
   }
 
+  /**
+   * Get the first 12 digits of the git sha for this build
+   */
+  getBuildShaShort() {
+    return this.versionInfo.buildShaShort;
+  }
+
   /**
    * Get the ISO 8601 date for this build
    */

diff --git a/src/dev/build/lib/version_info.ts b/src/dev/build/lib/version_info.ts
@@ -36,6 +36,7 @@ export async function getVersionInfo({ isRelease, versionQualifier, pkg }: Optio
 
   return {
     buildSha,
+    buildShaShort: buildSha.slice(0, 12),
     buildVersion,
     buildNumber: await getBuildNumber(),
     buildDate: new Date().toISOString(),

diff --git a/src/dev/build/tasks/create_cdn_assets_task.ts b/src/dev/build/tasks/create_cdn_assets_task.ts
@@ -23,10 +23,10 @@ export const CreateCdnAssets: Task = {
 
   async run(config, log, build) {
     const buildSource = build.resolvePath();
-    const buildNum = config.getBuildNumber();
+    const buildSha = config.getBuildShaShort();
     const buildVersion = config.getBuildVersion();
     const assets = config.resolveFromRepo('build', 'cdn-assets');
-    const bundles = resolve(assets, String(buildNum), 'bundles');
+    const bundles = resolve(assets, buildSha, 'bundles');
 
     await del(assets);
     await mkdirp(assets);
@@ -83,7 +83,7 @@ export const CreateCdnAssets: Task = {
     // packages/core/apps/core-apps-server-internal/src/core_app.ts
     await copyAll(
       resolve(buildSource, 'node_modules/@kbn/core-apps-server-internal/assets'),
-      resolve(assets, 'ui')
+      resolve(assets, buildSha, 'ui')
     );
 
     await compressTar({

diff --git a/src/dev/build/tasks/fetch_agent_versions_list.test.ts b/src/dev/build/tasks/fetch_agent_versions_list.test.ts
@@ -34,6 +34,7 @@ const config = new Config(
   {
     buildNumber: 1234,
     buildSha: 'abcd1234',
+    buildShaShort: 'abcd',
     buildVersion: '8.0.0',
     buildDate: '2023-05-15T23:12:09.000Z',
   },