diff --git a/.changeset/sweet-wings-act.md b/.changeset/sweet-wings-act.md new file mode 100644 index 000000000..fd64258fb --- /dev/null +++ b/.changeset/sweet-wings-act.md @@ -0,0 +1,5 @@ +--- +"io-wallet-user-func": patch +--- + +Switched DB connection from connection string to Managed Identity diff --git a/apps/io-wallet-user-func/src/app/config.ts b/apps/io-wallet-user-func/src/app/config.ts index c93acd1b4..20822fa55 100644 --- a/apps/io-wallet-user-func/src/app/config.ts +++ b/apps/io-wallet-user-func/src/app/config.ts @@ -135,10 +135,7 @@ const AzureFrontDoorConfig = t.type({ type AzureFrontDoorConfig = t.TypeOf; const AzureConfig = t.type({ - cosmos: t.intersection([ - AzureCosmosConfig, - t.type({ connectionString: t.string }), - ]), + cosmos: AzureCosmosConfig, frontDoor: AzureFrontDoorConfig, generic: AzureGenericConfig, storage: AzureStorageConfig, @@ -415,24 +412,12 @@ export const getAzureConfigFromEnvironment: RE.ReaderEither< NodeJS.ProcessEnv, Error, AzureConfig -> = pipe( - sequenceS(RE.Apply)({ - cosmos: getAzureCosmosConfigFromEnvironment, - cosmosAccountConnectionString: readFromEnvironment( - "CosmosAccountConnectionString", - ), - frontDoor: getAzureFrontDoorConfigFromEnvironment, - generic: getAzureGenericConfigFromEnvironment, - storage: getAzureStorageConfigFromEnvironment, - }), - RE.map(({ cosmos, cosmosAccountConnectionString, ...rest }) => ({ - ...rest, - cosmos: { - ...cosmos, - connectionString: cosmosAccountConnectionString, - }, - })), -); +> = sequenceS(RE.Apply)({ + cosmos: getAzureCosmosConfigFromEnvironment, + frontDoor: getAzureFrontDoorConfigFromEnvironment, + generic: getAzureGenericConfigFromEnvironment, + storage: getAzureStorageConfigFromEnvironment, +}); const getPidIssuerConfigFromEnvironment: RE.ReaderEither< NodeJS.ProcessEnv, diff --git a/apps/io-wallet-user-func/src/app/main.ts b/apps/io-wallet-user-func/src/app/main.ts index 6e5203d71..30bffa2af 100644 --- a/apps/io-wallet-user-func/src/app/main.ts +++ b/apps/io-wallet-user-func/src/app/main.ts @@ -55,19 +55,12 @@ const config = configOrError; const credential = new DefaultAzureCredential(); -// const cosmosClient = new CosmosClient({ -// aadCredentials: credential, -// connectionPolicy: { -// requestTimeout: config.azure.cosmos.requestTimeout, -// }, -// endpoint: config.azure.cosmos.endpoint, -// }); - const cosmosClient = new CosmosClient({ + aadCredentials: credential, connectionPolicy: { requestTimeout: config.azure.cosmos.requestTimeout, }, - connectionString: config.azure.cosmos.connectionString, + endpoint: config.azure.cosmos.endpoint, }); const subscriptionId = config.azure.generic.subscriptionId;