From 1278b740821365a7f42bf3eceb3deace0a810f43 Mon Sep 17 00:00:00 2001
From: Steven Hoang <drunkcoding@outlook.com>
Date: Fri, 6 Sep 2024 12:08:55 +0800
Subject: [PATCH 1/2] update packages

---
 package-lock.json | 17 ++++++++---------
 package.json      |  4 ++--
 2 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index d71b183..ff1f247 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -12,7 +12,7 @@
         "@drunk-pulumi/azure-providers": "^1.0.6",
         "@pulumi/azure-native": "^2.59.0",
         "@pulumi/azuread": "5.53.3",
-        "@pulumi/pulumi": "^3.130.0",
+        "@pulumi/pulumi": "^3.131.0",
         "@pulumi/random": "^4.16.3",
         "@pulumi/tls": "^5.0.4",
         "netmask": "^2.0.2",
@@ -23,7 +23,7 @@
         "@types/chai": "^4.3.19",
         "@types/mocha": "^10.0.7",
         "@types/netmask": "^2.0.5",
-        "@types/node": "^22.5.2",
+        "@types/node": "^22.5.4",
         "@types/node-forge": "^1.3.11",
         "chai": "^5.1.1",
         "cpy-cli": "^5.0.0",
@@ -2035,10 +2035,9 @@
       }
     },
     "node_modules/@pulumi/pulumi": {
-      "version": "3.130.0",
-      "resolved": "https://registry.npmjs.org/@pulumi/pulumi/-/pulumi-3.130.0.tgz",
-      "integrity": "sha512-WsvXRfEdCz+AcuzP41ABgN5Ye3qLt4v/EVZXUT7sMHU6G8uazaLtS92tpvNp+pgeRZf9kbotCEoABXKg+d+1oQ==",
-      "license": "Apache-2.0",
+      "version": "3.131.0",
+      "resolved": "https://registry.npmjs.org/@pulumi/pulumi/-/pulumi-3.131.0.tgz",
+      "integrity": "sha512-QNtQeav3dkU0mRdMe2TVvkBmIGkBevVvbD7/bt0fJlGoX/onzv5tysqi1GWCkXsq0FKtBtGYNpVD6wH0cqMN6g==",
       "dependencies": {
         "@grpc/grpc-js": "^1.10.1",
         "@logdna/tail-file": "^2.0.6",
@@ -2353,9 +2352,9 @@
       "dev": true
     },
     "node_modules/@types/node": {
-      "version": "22.5.2",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-22.5.2.tgz",
-      "integrity": "sha512-acJsPTEqYqulZS/Yp/S3GgeE6GZ0qYODUR8aVr/DkhHQ8l9nd4j5x1/ZJy9/gHrRlFMqkO6i0I3E27Alu4jjPg==",
+      "version": "22.5.4",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-22.5.4.tgz",
+      "integrity": "sha512-FDuKUJQm/ju9fT/SeX/6+gBzoPzlVCzfzmGkwKvRHQVxi4BntVbyIwf6a4Xn62mrvndLiml6z/UBXIdEVjQLXg==",
       "dependencies": {
         "undici-types": "~6.19.2"
       }
diff --git a/package.json b/package.json
index 56c4916..ddb27e9 100644
--- a/package.json
+++ b/package.json
@@ -41,7 +41,7 @@
     "@types/chai": "^4.3.19",
     "@types/mocha": "^10.0.7",
     "@types/netmask": "^2.0.5",
-    "@types/node": "^22.5.2",
+    "@types/node": "^22.5.4",
     "@types/node-forge": "^1.3.11",
     "chai": "^5.1.1",
     "cpy-cli": "^5.0.0",
@@ -58,7 +58,7 @@
     "@drunk-pulumi/azure-providers": "^1.0.6",
     "@pulumi/azure-native": "^2.59.0",
     "@pulumi/azuread": "5.53.3",
-    "@pulumi/pulumi": "^3.130.0",
+    "@pulumi/pulumi": "^3.131.0",
     "@pulumi/random": "^4.16.3",
     "@pulumi/tls": "^5.0.4",
     "netmask": "^2.0.2",

From d9296f306d00fd4b5f6750d57326b0cd14c3aa5c Mon Sep 17 00:00:00 2001
From: Steven Hoang <drunkcoding@outlook.com>
Date: Fri, 6 Sep 2024 15:04:21 +0800
Subject: [PATCH 2/2] update servicebus naming

---
 src/Builder/ServiceBusBuilder.ts | 15 ++++++++++++++-
 src/Common/Naming.ts             |  1 +
 2 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/src/Builder/ServiceBusBuilder.ts b/src/Builder/ServiceBusBuilder.ts
index 1e48116..839b172 100644
--- a/src/Builder/ServiceBusBuilder.ts
+++ b/src/Builder/ServiceBusBuilder.ts
@@ -9,7 +9,7 @@ import {
 import { naming, isPrd } from '../Common';
 import * as bus from '@pulumi/azure-native/servicebus/v20230101preview';
 import { addEncryptKey } from '../KeyVault/Helper';
-import { addCustomSecrets } from '../KeyVault/CustomHelper';
+import { addCustomSecret, addCustomSecrets } from '../KeyVault/CustomHelper';
 import { ServiceBusPrivateLink } from '../VNet';
 
 const defaultQueueOptions: types.ServiceBusQueueArgs = {
@@ -174,6 +174,19 @@ class ServiceBusBuilder
         dependsOn: this._sbInstance,
       }),
     );
+
+    //Add ServiceBus endpoint to vault
+    if (vaultInfo) {
+      addCustomSecret({
+        name: `${this._instanceName}-endpoint`,
+        dependsOn: this._sbInstance,
+        contentType: `Service Bus ${this._instanceName}`,
+        value: this._sbInstance!.serviceBusEndpoint.apply(
+          (e) => new URL(e).hostname,
+        ),
+        vaultInfo,
+      });
+    }
   }
 
   private buildNetwork() {
diff --git a/src/Common/Naming.ts b/src/Common/Naming.ts
index 5d659c7..e4f442e 100644
--- a/src/Common/Naming.ts
+++ b/src/Common/Naming.ts
@@ -123,6 +123,7 @@ export const rules = {
   },
   getServiceBusName: {
     cleanName: true,
+    includeOrgName: true,
     maxLength: 80,
     suffix: 'bus',
   },