Merge pull request #84 from baoduy/develop

Develop

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",

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() {

src/Common/Naming.ts

@@ -123,6 +123,7 @@ export const rules = {
   },
   getServiceBusName: {
     cleanName: true,
+    includeOrgName: true,
     maxLength: 80,
     suffix: 'bus',
   },