WIP: remove connection string

pagopa · Jun 5, 2024 · 8c118c6 · 8c118c6
1 parent 1b649bf
commit 8c118c6
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 14 deletions.
diff --git a/Info/handler.ts b/Info/handler.ts
@@ -58,11 +58,7 @@ export function Info(): express.RequestHandler {
         healthcheck.checkAzureStorageHealth(
           c.NOTIFICATIONS_STORAGE_CONNECTION_STRING
         ),
-      c =>
-        checkAzureNotificationHub(
-          c.AZURE_NH_CONNECTION_STRING,
-          c.AZURE_NH_HUB_NAME
-        ),
+      c => checkAzureNotificationHub(c.AZURE_NH_ENDPOINT, c.AZURE_NH_HUB_NAME),
       ...[0, 1, 2, 3].map(i => (c: t.TypeOf<typeof IConfig>) =>
         checkAzureNotificationHub(
           c.AZURE_NOTIFICATION_HUB_PARTITIONS[i].endpoint,

diff --git a/utils/config.ts b/utils/config.ts
@@ -89,7 +89,7 @@ const BaseConfig = t.intersection([
 
     // Legacy Notification Hub configuration
     t.interface({
-      AZURE_NH_CONNECTION_STRING: NonEmptyString,
+      AZURE_NH_ENDPOINT: NonEmptyString,
       AZURE_NH_HUB_NAME: NonEmptyString
     }),
 

diff --git a/utils/healthcheck.ts b/utils/healthcheck.ts
@@ -11,14 +11,14 @@ import { buildNHService } from "./notificationhubServicePartition";
  * @returns either true or an array of error messages
  */
 export const checkAzureNotificationHub = (
-  AZURE_NH_CONNECTION_STRING: NonEmptyString,
+  AZURE_NH_ENDPOINT: NonEmptyString,
   AZURE_NH_HUB_NAME: NonEmptyString
 ): healthcheck.HealthCheck<"AzureNotificationHub"> =>
   pipe(
     TE.tryCatch(
       () =>
         buildNHService({
-          AZURE_NH_CONNECTION_STRING,
+          AZURE_NH_ENDPOINT,
           AZURE_NH_HUB_NAME
         }).deleteInstallation("aFakeInstallation"),
       healthcheck.toHealthProblems("AzureNotificationHub")

diff --git a/utils/notificationhubServicePartition.ts b/utils/notificationhubServicePartition.ts
@@ -9,7 +9,7 @@ import { InstallationId } from "../generated/notifications/InstallationId";
 import { IConfig } from "./config";
 
 export const NotificationHubConfig = t.interface({
-  AZURE_NH_CONNECTION_STRING: NonEmptyString,
+  AZURE_NH_ENDPOINT: NonEmptyString,
   AZURE_NH_HUB_NAME: NonEmptyString
 });
 
@@ -24,7 +24,7 @@ export type NotificationHubConfig = t.TypeOf<typeof NotificationHubConfig>;
 export const getNHLegacyConfig = (
   envConfig: IConfig
 ): NotificationHubConfig => ({
-  AZURE_NH_CONNECTION_STRING: envConfig.AZURE_NH_CONNECTION_STRING,
+  AZURE_NH_ENDPOINT: envConfig.AZURE_NH_ENDPOINT,
   AZURE_NH_HUB_NAME: envConfig.AZURE_NH_HUB_NAME
 });
 
@@ -55,7 +55,7 @@ export const getNotificationHubPartitionConfig = (envConfig: IConfig) => (
       Error(`Unable to find Notification Hub partition for ${sha}`)
     ),
     E.map(partition => ({
-      AZURE_NH_CONNECTION_STRING: partition.connectionString,
+      AZURE_NH_ENDPOINT: partition.endpoint,
       AZURE_NH_HUB_NAME: partition.name
     })),
     E.getOrElseW(e => {
@@ -65,6 +65,6 @@ export const getNotificationHubPartitionConfig = (envConfig: IConfig) => (
 
 export const buildNHService = ({
   AZURE_NH_HUB_NAME,
-  AZURE_NH_CONNECTION_STRING
+  AZURE_NH_ENDPOINT
 }: NotificationHubConfig): NotificationHubsClient =>
-  new NotificationHubsClient(AZURE_NH_CONNECTION_STRING, AZURE_NH_HUB_NAME);
+  new NotificationHubsClient(AZURE_NH_ENDPOINT, AZURE_NH_HUB_NAME);
diff --git a/utils/types.ts b/utils/types.ts
@@ -50,7 +50,6 @@ export type NotificationHubPartition = t.TypeOf<
   typeof NotificationHubPartition
 >;
 export const NotificationHubPartition = t.interface({
-  connectionString: NonEmptyString,
   endpoint: NonEmptyString,
   name: NonEmptyString,
   partitionRegex: RegExpFromString