From b57795b0b488ee1bbe5af053ac7ce0a21d3d52c6 Mon Sep 17 00:00:00 2001 From: Srinidhi Veeraraghavan Date: Tue, 17 Mar 2026 16:57:25 +0000 Subject: [PATCH] feat(constructs): shortening the custom urn of pulumi constructs --- src/lib/azure/common/construct.ts | 2 +- src/lib/cloudflare/common/construct.ts | 2 +- .../services/api-management-manager.test.ts | 2 +- .../app-configuration-manager.test.ts | 2 +- .../services/app-service-manager.test.ts | 4 +-- .../application-insights-manager.test.ts | 2 +- .../azure/services/cosmosdb-manager.test.ts | 6 ++-- src/test/azure/services/dns-manager.test.ts | 8 +++--- .../azure/services/eventgrid-manager.test.ts | 8 +++--- .../azure/services/function-manager.test.ts | 6 ++-- .../azure/services/key-vault-manager.test.ts | 2 +- .../azure/services/monitor-manager.test.ts | 2 +- .../operational-insights-manager.test.ts | 2 +- src/test/azure/services/redis-manager.test.ts | 2 +- .../services/resource-group-manager.test.ts | 2 +- .../azure/services/servicebus-manager.test.ts | 8 +++--- .../azure/services/storage-manager.test.ts | 6 ++-- .../common-cloudflare-construct.test.ts | 4 +-- .../construct/pages-static-site.test.ts | 8 +++--- .../cloudflare/construct/worker-site.test.ts | 10 +++---- .../services/access-manager.test.ts | 28 +++++++++---------- .../services/api-shield-manager.test.ts | 12 ++++---- .../cloudflare/services/argo-manager.test.ts | 6 ++-- .../services/firewall-manager.test.ts | 6 ++-- .../cloudflare/services/page-manager.test.ts | 8 +++--- .../services/record-manager.test.ts | 6 ++-- .../services/rule-set-manager.test.ts | 4 +-- .../services/worker-manager.test.ts | 4 +-- .../cloudflare/services/zone-manager.test.ts | 6 ++-- 29 files changed, 84 insertions(+), 84 deletions(-) diff --git a/src/lib/azure/common/construct.ts b/src/lib/azure/common/construct.ts index 989556d0..5b9cff3f 100644 --- a/src/lib/azure/common/construct.ts +++ b/src/lib/azure/common/construct.ts @@ -60,7 +60,7 @@ export class CommonAzureConstruct extends ComponentResource { storageManager: AzureStorageManager constructor(name: string, props: CommonAzureStackProps, options?: ComponentResourceOptions) { - super(`custom:azure:Construct:${name}`, name, props, options) + super(`azure:${name}`, name, props, options) this.props = props this.options = options this.id = name diff --git a/src/lib/cloudflare/common/construct.ts b/src/lib/cloudflare/common/construct.ts index e33ed660..5470c9a8 100644 --- a/src/lib/cloudflare/common/construct.ts +++ b/src/lib/cloudflare/common/construct.ts @@ -34,7 +34,7 @@ export class CommonCloudflareConstruct extends ComponentResource { provider: CloudflareProvider constructor(name: string, props: CommonCloudflareStackProps, options?: ComponentResourceOptions) { - super(`custom:cloudflare:Construct:${name}`, name, props, options) + super(`cloudflare:${name}`, name, props, options) this.props = props this.options = options this.id = name diff --git a/src/test/azure/services/api-management-manager.test.ts b/src/test/azure/services/api-management-manager.test.ts index b772ed5a..f6518342 100644 --- a/src/test/azure/services/api-management-manager.test.ts +++ b/src/test/azure/services/api-management-manager.test.ts @@ -161,7 +161,7 @@ describe('TestAzureApiManagementConstruct', () => { .apply(([id, urn, name, location, sku, tags]) => { expect(id).toEqual('test-api-management-dev-am-id') expect(urn).toEqual( - 'urn:pulumi:stack::project::custom:azure:Construct:test-common-stack$azure-native:apimanagement:ApiManagementService::test-api-management-dev-am' + 'urn:pulumi:stack::project::azure:test-common-stack$azure-native:apimanagement:ApiManagementService::test-api-management-dev-am' ) expect(name).toEqual('test-api-management-dev') expect(location).toEqual('eastus') diff --git a/src/test/azure/services/app-configuration-manager.test.ts b/src/test/azure/services/app-configuration-manager.test.ts index 99856932..d1f1707c 100644 --- a/src/test/azure/services/app-configuration-manager.test.ts +++ b/src/test/azure/services/app-configuration-manager.test.ts @@ -124,7 +124,7 @@ describe('TestAzureAppConfigurationConstruct', () => { .apply(([id, urn, name, location, sku, tags]) => { expect(id).toEqual('test-app-configuration-dev-ac-id') expect(urn).toEqual( - 'urn:pulumi:stack::project::custom:azure:Construct:test-common-stack$azure-native:appconfiguration:ConfigurationStore::test-app-configuration-dev-ac' + 'urn:pulumi:stack::project::azure:test-common-stack$azure-native:appconfiguration:ConfigurationStore::test-app-configuration-dev-ac' ) // expect(name).toEqual('test-app-configuration-dev') expect(location).toEqual('eastus') diff --git a/src/test/azure/services/app-service-manager.test.ts b/src/test/azure/services/app-service-manager.test.ts index 7ef213e4..07206550 100644 --- a/src/test/azure/services/app-service-manager.test.ts +++ b/src/test/azure/services/app-service-manager.test.ts @@ -131,7 +131,7 @@ describe('TestAzureAppServiceConstruct', () => { .apply(([id, urn, name, location, sku, tags]) => { expect(id).toEqual('test-app-service-plan-dev-as-id') expect(urn).toEqual( - 'urn:pulumi:stack::project::custom:azure:Construct:test-common-stack$azure-native:web:AppServicePlan::test-app-service-plan-dev-as' + 'urn:pulumi:stack::project::azure:test-common-stack$azure-native:web:AppServicePlan::test-app-service-plan-dev-as' ) expect(name).toEqual('test-app-service-plan-dev') expect(location).toEqual('eastus') @@ -157,7 +157,7 @@ describe('TestAzureLinuxWebAppConstruct', () => { .apply(([id, urn, name, location, enabled, httpsOnly, siteConfig, tags]) => { expect(id).toEqual('test-linux-web-app-dev-lwa-id') expect(urn).toEqual( - 'urn:pulumi:stack::project::custom:azure:Construct:test-common-stack$azure-native:web:WebApp::test-linux-web-app-dev-lwa' + 'urn:pulumi:stack::project::azure:test-common-stack$azure-native:web:WebApp::test-linux-web-app-dev-lwa' ) expect(name).toEqual('test-linux-web-app-dev') expect(location).toEqual('eastus') diff --git a/src/test/azure/services/application-insights-manager.test.ts b/src/test/azure/services/application-insights-manager.test.ts index 19d95951..554c6d03 100644 --- a/src/test/azure/services/application-insights-manager.test.ts +++ b/src/test/azure/services/application-insights-manager.test.ts @@ -124,7 +124,7 @@ describe('TestAzureApplicationInsightsConstruct', () => { .apply(([id, urn, name, location, applicationType, tags]) => { expect(id).toEqual('test-application-insights-dev-ai-id') expect(urn).toEqual( - 'urn:pulumi:stack::project::custom:azure:Construct:test-common-stack$azure-native:applicationinsights:Component::test-application-insights-dev-ai' + 'urn:pulumi:stack::project::azure:test-common-stack$azure-native:applicationinsights:Component::test-application-insights-dev-ai' ) // expect(name).toEqual('test-application-insights-dev') expect(location).toEqual('eastus') diff --git a/src/test/azure/services/cosmosdb-manager.test.ts b/src/test/azure/services/cosmosdb-manager.test.ts index 28919fdb..035ebd0d 100644 --- a/src/test/azure/services/cosmosdb-manager.test.ts +++ b/src/test/azure/services/cosmosdb-manager.test.ts @@ -149,7 +149,7 @@ describe('TestAzureCosmosDbConstruct', () => { .apply(([id, urn, name, location, consistencyPolicy, tags]) => { expect(id).toEqual('test-cosmosdb-account-dev-ca-id') expect(urn).toEqual( - 'urn:pulumi:stack::project::custom:azure:Construct:test-common-stack$azure-native:cosmosdb:DatabaseAccount::test-cosmosdb-account-dev-ca' + 'urn:pulumi:stack::project::azure:test-common-stack$azure-native:cosmosdb:DatabaseAccount::test-cosmosdb-account-dev-ca' ) expect(name).toEqual('test-cosmosdb-account-dev') expect(location).toEqual('eastus') @@ -170,7 +170,7 @@ describe('TestAzureCosmosDbConstruct', () => { .apply(([id, urn, name]) => { expect(id).toEqual('test-cosmosdb-database-dev-cd-id') expect(urn).toEqual( - 'urn:pulumi:stack::project::custom:azure:Construct:test-common-stack$azure-native:cosmosdb:SqlResourceSqlDatabase::test-cosmosdb-database-dev-cd' + 'urn:pulumi:stack::project::azure:test-common-stack$azure-native:cosmosdb:SqlResourceSqlDatabase::test-cosmosdb-database-dev-cd' ) expect(name).toEqual('test-cosmosdb-database-dev') }) @@ -189,7 +189,7 @@ describe('TestAzureCosmosDbConstruct', () => { .apply(([id, urn, name, resource]) => { expect(id).toEqual('test-cosmosdb-container-dev-cc-id') expect(urn).toEqual( - 'urn:pulumi:stack::project::custom:azure:Construct:test-common-stack$azure-native:cosmosdb:SqlResourceSqlContainer::test-cosmosdb-container-dev-cc' + 'urn:pulumi:stack::project::azure:test-common-stack$azure-native:cosmosdb:SqlResourceSqlContainer::test-cosmosdb-container-dev-cc' ) expect(name).toEqual('test-cosmosdb-container-dev') expect(resource).toEqual({ diff --git a/src/test/azure/services/dns-manager.test.ts b/src/test/azure/services/dns-manager.test.ts index 607091b1..95615be3 100644 --- a/src/test/azure/services/dns-manager.test.ts +++ b/src/test/azure/services/dns-manager.test.ts @@ -148,7 +148,7 @@ describe('TestAzureDnsConstruct', () => { .apply(([id, urn, name, location, tags]) => { expect(id).toEqual('test-dns-zone-dev-dz-id') expect(urn).toEqual( - 'urn:pulumi:stack::project::custom:azure:Construct:test-common-stack$azure-native:dns:Zone::test-dns-zone-dev-dz' + 'urn:pulumi:stack::project::azure:test-common-stack$azure-native:dns:Zone::test-dns-zone-dev-dz' ) expect(name).toEqual('test-dns-zone-dev') expect(location).toEqual('global') @@ -170,7 +170,7 @@ describe('TestAzureDnsConstruct', () => { .apply(([id, urn, name, aRecords, ttl]) => { expect(id).toEqual('test-dns-a-record-dev-da-id') expect(urn).toEqual( - 'urn:pulumi:stack::project::custom:azure:Construct:test-common-stack$azure-native:dns:RecordSet::test-dns-a-record-dev-da' + 'urn:pulumi:stack::project::azure:test-common-stack$azure-native:dns:RecordSet::test-dns-a-record-dev-da' ) expect(name).toEqual('test-a-record') expect(aRecords).toEqual([{ ipv4Address: '1.2.3.4' }]) @@ -192,7 +192,7 @@ describe('TestAzureDnsConstruct', () => { .apply(([id, urn, name, cnameRecord, ttl]) => { expect(id).toEqual('test-dns-cname-record-dev-dc-id') expect(urn).toEqual( - 'urn:pulumi:stack::project::custom:azure:Construct:test-common-stack$azure-native:dns:RecordSet::test-dns-cname-record-dev-dc' + 'urn:pulumi:stack::project::azure:test-common-stack$azure-native:dns:RecordSet::test-dns-cname-record-dev-dc' ) expect(name).toEqual('test-cname-record') expect(cnameRecord).toEqual({ cname: 'test.example.com' }) @@ -214,7 +214,7 @@ describe('TestAzureDnsConstruct', () => { .apply(([id, urn, name, txtRecords, ttl]) => { expect(id).toEqual('test-dns-txt-record-dev-dt-id') expect(urn).toEqual( - 'urn:pulumi:stack::project::custom:azure:Construct:test-common-stack$azure-native:dns:RecordSet::test-dns-txt-record-dev-dt' + 'urn:pulumi:stack::project::azure:test-common-stack$azure-native:dns:RecordSet::test-dns-txt-record-dev-dt' ) expect(name).toEqual('test-txt-record') expect(txtRecords).toEqual([{ value: ['test-record'] }]) diff --git a/src/test/azure/services/eventgrid-manager.test.ts b/src/test/azure/services/eventgrid-manager.test.ts index 22d3f1c6..f1d2d1f2 100644 --- a/src/test/azure/services/eventgrid-manager.test.ts +++ b/src/test/azure/services/eventgrid-manager.test.ts @@ -162,7 +162,7 @@ describe('TestAzureEventgridConstruct', () => { .apply(([id, urn, name, location, tags]) => { expect(id).toEqual('test-eventgrid-topic-dev-et-id') expect(urn).toEqual( - 'urn:pulumi:stack::project::custom:azure:Construct:test-common-stack$azure-native:eventgrid:Topic::test-eventgrid-topic-dev-et' + 'urn:pulumi:stack::project::azure:test-common-stack$azure-native:eventgrid:Topic::test-eventgrid-topic-dev-et' ) expect(name).toEqual('test-eventgrid-topic-dev') expect(location).toEqual('eastus') @@ -182,7 +182,7 @@ describe('TestAzureEventgridConstruct', () => { .apply(([id, urn, name]) => { expect(id).toEqual('test-eventgrid-subscription-dev-es-id') expect(urn).toEqual( - 'urn:pulumi:stack::project::custom:azure:Construct:test-common-stack$azure-native:eventgrid:EventSubscription::test-eventgrid-subscription-dev-es' + 'urn:pulumi:stack::project::azure:test-common-stack$azure-native:eventgrid:EventSubscription::test-eventgrid-subscription-dev-es' ) expect(name).toEqual('test-eventgrid-subscription-dev') }) @@ -202,7 +202,7 @@ describe('TestAzureEventgridConstruct', () => { .apply(([id, urn, name, location, tags]) => { expect(id).toEqual('test-eventgrid-system-topic-dev-est-id') expect(urn).toEqual( - 'urn:pulumi:stack::project::custom:azure:Construct:test-common-stack$azure-native:eventgrid:SystemTopic::test-eventgrid-system-topic-dev-est' + 'urn:pulumi:stack::project::azure:test-common-stack$azure-native:eventgrid:SystemTopic::test-eventgrid-system-topic-dev-est' ) expect(name).toEqual('test-eventgrid-system-topic-dev') expect(location).toEqual('eastus') @@ -222,7 +222,7 @@ describe('TestAzureEventgridConstruct', () => { .apply(([id, urn, name]) => { expect(id).toEqual('test-eventgrid-subscription-dev-ests-id') expect(urn).toEqual( - 'urn:pulumi:stack::project::custom:azure:Construct:test-common-stack$azure-native:eventgrid:SystemTopicEventSubscription::test-eventgrid-subscription-dev-ests' + 'urn:pulumi:stack::project::azure:test-common-stack$azure-native:eventgrid:SystemTopicEventSubscription::test-eventgrid-subscription-dev-ests' ) expect(name).toEqual('test-eventgrid-system-subscription-dev') }) diff --git a/src/test/azure/services/function-manager.test.ts b/src/test/azure/services/function-manager.test.ts index b8157955..697bb48f 100644 --- a/src/test/azure/services/function-manager.test.ts +++ b/src/test/azure/services/function-manager.test.ts @@ -140,7 +140,7 @@ describe('TestAzureFunctionConstruct', () => { .apply(([id, urn, name, location, kind]) => { expect(id).toEqual('test-function-app-dev-fa-id') expect(urn).toEqual( - 'urn:pulumi:stack::project::custom:azure:Construct:test-common-stack$azure-native:web:WebApp::test-function-app-dev-fa' + 'urn:pulumi:stack::project::azure:test-common-stack$azure-native:web:WebApp::test-function-app-dev-fa' ) expect(name).toEqual('test-function-app-dev') expect(location).toEqual('eastus') @@ -156,7 +156,7 @@ describe('TestAzureFunctionConstruct', () => { .apply(([id, urn, name]) => { expect(id).toEqual('test-function-dev-fc-id') expect(urn).toEqual( - 'urn:pulumi:stack::project::custom:azure:Construct:test-common-stack$azure-native:web:WebAppFunction::test-function-dev-fc' + 'urn:pulumi:stack::project::azure:test-common-stack$azure-native:web:WebAppFunction::test-function-dev-fc' ) expect(name).toEqual('test-function-dev') }) @@ -176,7 +176,7 @@ describe('TestAzureFunctionConstruct', () => { .apply(([id, urn, name, location, kind]) => { expect(id).toEqual('test-function-app-flex-consumption-dev-fc-id') expect(urn).toEqual( - 'urn:pulumi:stack::project::custom:azure:Construct:test-common-stack$azure-native:web:WebApp::test-function-app-flex-consumption-dev-fc' + 'urn:pulumi:stack::project::azure:test-common-stack$azure-native:web:WebApp::test-function-app-flex-consumption-dev-fc' ) expect(name).toEqual('test-function-app-flex-consumption-dev') expect(location).toEqual('eastus') diff --git a/src/test/azure/services/key-vault-manager.test.ts b/src/test/azure/services/key-vault-manager.test.ts index ab2c2e70..b8530361 100644 --- a/src/test/azure/services/key-vault-manager.test.ts +++ b/src/test/azure/services/key-vault-manager.test.ts @@ -120,7 +120,7 @@ describe('TestAzureKeyVaultConstruct', () => { .apply(([id, urn, name, location, properties, tags]) => { expect(id).toEqual('test-key-vault-dev-kv-id') expect(urn).toEqual( - 'urn:pulumi:stack::project::custom:azure:Construct:test-common-stack$azure-native:keyvault:Vault::test-key-vault-dev-kv' + 'urn:pulumi:stack::project::azure:test-common-stack$azure-native:keyvault:Vault::test-key-vault-dev-kv' ) expect(name).toEqual('test-key-vault-dev') expect(location).toEqual('eastus') diff --git a/src/test/azure/services/monitor-manager.test.ts b/src/test/azure/services/monitor-manager.test.ts index c3381abf..1534ddc4 100644 --- a/src/test/azure/services/monitor-manager.test.ts +++ b/src/test/azure/services/monitor-manager.test.ts @@ -120,7 +120,7 @@ describe('TestAzureMonitorConstruct', () => { .apply(([id, urn, name, logs, metrics, storageAccountId]) => { expect(id).toEqual('test-monitor-diagnostic-setting-dev-ds-id') expect(urn).toEqual( - 'urn:pulumi:stack::project::custom:azure:Construct:test-common-stack$azure-native:monitor:DiagnosticSetting::test-monitor-diagnostic-setting-dev-ds' + 'urn:pulumi:stack::project::azure:test-common-stack$azure-native:monitor:DiagnosticSetting::test-monitor-diagnostic-setting-dev-ds' ) expect(name).toEqual('test-monitor-diagnostic-setting-dev') expect(logs).toEqual([{ categoryGroup: 'allLogs', enabled: true }]) diff --git a/src/test/azure/services/operational-insights-manager.test.ts b/src/test/azure/services/operational-insights-manager.test.ts index 0a3762d2..22713e4d 100644 --- a/src/test/azure/services/operational-insights-manager.test.ts +++ b/src/test/azure/services/operational-insights-manager.test.ts @@ -119,7 +119,7 @@ describe('TestOperationalInsightsConstruct', () => { .apply(([id, urn, name, location, tags]) => { expect(id).toEqual('test-workspace-dev-lw-id') expect(urn).toEqual( - 'urn:pulumi:stack::project::custom:azure:Construct:test-common-stack$azure-native:operationalinsights:Workspace::test-workspace-dev-lw' + 'urn:pulumi:stack::project::azure:test-common-stack$azure-native:operationalinsights:Workspace::test-workspace-dev-lw' ) expect(name).toEqual('test-workspace-dev') expect(location).toEqual('eastus') diff --git a/src/test/azure/services/redis-manager.test.ts b/src/test/azure/services/redis-manager.test.ts index 6c575d9d..a3f24744 100644 --- a/src/test/azure/services/redis-manager.test.ts +++ b/src/test/azure/services/redis-manager.test.ts @@ -125,7 +125,7 @@ describe('TestAzureRedisConstruct', () => { .apply(([id, urn, name, location, sku, tlsVersion, nonSslPort, tags]) => { expect(id).toEqual('test-redis-cache-dev-rc-id') expect(urn).toEqual( - 'urn:pulumi:stack::project::custom:azure:Construct:test-common-stack$azure-native:redis:Redis::test-redis-cache-dev-rc' + 'urn:pulumi:stack::project::azure:test-common-stack$azure-native:redis:Redis::test-redis-cache-dev-rc' ) expect(name).toEqual('test-redis-cache-dev') expect(location).toEqual('eastus') diff --git a/src/test/azure/services/resource-group-manager.test.ts b/src/test/azure/services/resource-group-manager.test.ts index 59e21c73..adc50e4b 100644 --- a/src/test/azure/services/resource-group-manager.test.ts +++ b/src/test/azure/services/resource-group-manager.test.ts @@ -111,7 +111,7 @@ describe('TestAzureResourceGroupConstruct', () => { .apply(([id, urn, name, location, tags]) => { expect(id).toEqual('test-resource-group-dev-rg-id') expect(urn).toEqual( - 'urn:pulumi:stack::project::custom:azure:Construct:test-common-stack$azure-native:resources:ResourceGroup::test-resource-group-dev-rg' + 'urn:pulumi:stack::project::azure:test-common-stack$azure-native:resources:ResourceGroup::test-resource-group-dev-rg' ) expect(name).toEqual('test-resource-group-dev') expect(location).toEqual('eastus') diff --git a/src/test/azure/services/servicebus-manager.test.ts b/src/test/azure/services/servicebus-manager.test.ts index 56a61e85..849e9dab 100644 --- a/src/test/azure/services/servicebus-manager.test.ts +++ b/src/test/azure/services/servicebus-manager.test.ts @@ -176,7 +176,7 @@ describe('TestAzureServicebusConstruct', () => { .apply(([id, urn, name, location, sku, identity, tags]) => { expect(id).toEqual('test-servicebus-namespace-dev-sn-id') expect(urn).toEqual( - 'urn:pulumi:stack::project::custom:azure:Construct:test-common-stack$azure-native:servicebus:Namespace::test-servicebus-namespace-dev-sn' + 'urn:pulumi:stack::project::azure:test-common-stack$azure-native:servicebus:Namespace::test-servicebus-namespace-dev-sn' ) expect(name).toEqual('test-servicebus-namespace-dev') expect(location).toEqual('eastus') @@ -198,7 +198,7 @@ describe('TestAzureServicebusConstruct', () => { .apply(([id, urn, name]) => { expect(id).toEqual('test-servicebus-topic-dev-st-id') expect(urn).toEqual( - 'urn:pulumi:stack::project::custom:azure:Construct:test-common-stack$azure-native:servicebus:Topic::test-servicebus-topic-dev-st' + 'urn:pulumi:stack::project::azure:test-common-stack$azure-native:servicebus:Topic::test-servicebus-topic-dev-st' ) expect(name).toEqual('test-servicebus-topic-dev') }) @@ -218,7 +218,7 @@ describe('TestAzureServicebusConstruct', () => { .apply(([id, urn, name, requiresDuplicateDetection, deadLetteringOnMessageExpiration]) => { expect(id).toEqual('test-servicebus-queue-dev-sq-id') expect(urn).toEqual( - 'urn:pulumi:stack::project::custom:azure:Construct:test-common-stack$azure-native:servicebus:Queue::test-servicebus-queue-dev-sq' + 'urn:pulumi:stack::project::azure:test-common-stack$azure-native:servicebus:Queue::test-servicebus-queue-dev-sq' ) expect(name).toEqual('test-servicebus-queue-dev') expect(requiresDuplicateDetection).toEqual(true) @@ -239,7 +239,7 @@ describe('TestAzureServicebusConstruct', () => { .apply(([id, urn, name, maxDeliveryCount]) => { expect(id).toEqual('test-servicebus-subscription-dev-ss-id') expect(urn).toEqual( - 'urn:pulumi:stack::project::custom:azure:Construct:test-common-stack$azure-native:servicebus:Subscription::test-servicebus-subscription-dev-ss' + 'urn:pulumi:stack::project::azure:test-common-stack$azure-native:servicebus:Subscription::test-servicebus-subscription-dev-ss' ) expect(name).toEqual('test-servicebus-subscription-dev') expect(maxDeliveryCount).toEqual(1) diff --git a/src/test/azure/services/storage-manager.test.ts b/src/test/azure/services/storage-manager.test.ts index d1dd8ea5..8d38dd77 100644 --- a/src/test/azure/services/storage-manager.test.ts +++ b/src/test/azure/services/storage-manager.test.ts @@ -136,7 +136,7 @@ describe('TestAzureStorageConstruct', () => { .apply(([id, urn, name, location, sku, tags]) => { expect(id).toEqual('test-storage-account-dev-sa-id') expect(urn).toEqual( - 'urn:pulumi:stack::project::custom:azure:Construct:test-common-stack$azure-native:storage:StorageAccount::test-storage-account-dev-sa' + 'urn:pulumi:stack::project::azure:test-common-stack$azure-native:storage:StorageAccount::test-storage-account-dev-sa' ) expect(name).toEqual('teststorageaccountdev') expect(location).toEqual('eastus') @@ -157,7 +157,7 @@ describe('TestAzureStorageConstruct', () => { .apply(([id, urn, name]) => { expect(id).toEqual('test-storage-container-dev-sc-id') expect(urn).toEqual( - 'urn:pulumi:stack::project::custom:azure:Construct:test-common-stack$azure-native:storage:BlobContainer::test-storage-container-dev-sc' + 'urn:pulumi:stack::project::azure:test-common-stack$azure-native:storage:BlobContainer::test-storage-container-dev-sc' ) expect(name).toEqual('test-storage-container-dev') }) @@ -171,7 +171,7 @@ describe('TestAzureStorageConstruct', () => { .apply(([id, urn, name]) => { expect(id).toEqual('test-storage-blob-dev-sb-id') expect(urn).toEqual( - 'urn:pulumi:stack::project::custom:azure:Construct:test-common-stack$azure-native:storage:Blob::test-storage-blob-dev-sb' + 'urn:pulumi:stack::project::azure:test-common-stack$azure-native:storage:Blob::test-storage-blob-dev-sb' ) expect(name).toEqual('test-storage-blob-dev') }) diff --git a/src/test/cloudflare/common/common-cloudflare-construct.test.ts b/src/test/cloudflare/common/common-cloudflare-construct.test.ts index 05884f4e..e26db41a 100644 --- a/src/test/cloudflare/common/common-cloudflare-construct.test.ts +++ b/src/test/cloudflare/common/common-cloudflare-construct.test.ts @@ -73,7 +73,7 @@ describe('TestCloudflareCommonConstruct', () => { .apply(([id, urn, name, account]) => { expect(id).toEqual('test-zone-dev-id') expect(urn).toEqual( - 'urn:pulumi:stack::project::custom:cloudflare:Construct:test-common-stack$cloudflare:index/zone:Zone::test-zone-dev' + 'urn:pulumi:stack::project::cloudflare:test-common-stack$cloudflare:index/zone:Zone::test-zone-dev' ) expect(name).toEqual('gradientedge.io') expect(account.id).toEqual('test-account') @@ -93,7 +93,7 @@ describe('TestCloudflareCommonConstruct', () => { .apply(([id, urn, zoneId]) => { expect(id).toEqual('test-zone-cache-reserve-dev-id') expect(urn).toEqual( - 'urn:pulumi:stack::project::custom:cloudflare:Construct:test-common-stack$cloudflare:index/zoneCacheReserve:ZoneCacheReserve::test-zone-cache-reserve-dev' + 'urn:pulumi:stack::project::cloudflare:test-common-stack$cloudflare:index/zoneCacheReserve:ZoneCacheReserve::test-zone-cache-reserve-dev' ) expect(zoneId).toEqual('test-zone-dev-id') }) diff --git a/src/test/cloudflare/construct/pages-static-site.test.ts b/src/test/cloudflare/construct/pages-static-site.test.ts index 7aed8afd..38693095 100644 --- a/src/test/cloudflare/construct/pages-static-site.test.ts +++ b/src/test/cloudflare/construct/pages-static-site.test.ts @@ -101,7 +101,7 @@ describe('TestCloudflarePagesStaticSite', () => { .apply(([id, urn, name, account]) => { expect(id).toEqual('test-common-stack-zone-id') expect(urn).toEqual( - 'urn:pulumi:stack::project::custom:cloudflare:Construct:test-common-stack$cloudflare:index/zone:Zone::test-common-stack-zone' + 'urn:pulumi:stack::project::cloudflare:test-common-stack$cloudflare:index/zone:Zone::test-common-stack-zone' ) expect(name).toEqual('gradientedge.io') expect(account.id).toEqual('test-account') @@ -123,7 +123,7 @@ describe('TestCloudflarePagesStaticSite', () => { .apply(([id, urn, accountId, name, productionBranch]) => { expect(id).toEqual('test-common-stack-site-project-id') expect(urn).toEqual( - 'urn:pulumi:stack::project::custom:cloudflare:Construct:test-common-stack$cloudflare:index/pagesProject:PagesProject::test-common-stack-site-project' + 'urn:pulumi:stack::project::cloudflare:test-common-stack$cloudflare:index/pagesProject:PagesProject::test-common-stack-site-project' ) expect(accountId).toEqual('123456789012') expect(name).toEqual('test-simple-project-dev') @@ -146,7 +146,7 @@ describe('TestCloudflarePagesStaticSite', () => { .apply(([id, urn, accountId, name, projectName]) => { expect(id).toEqual('test-common-stack-site-domain-id') expect(urn).toEqual( - 'urn:pulumi:stack::project::custom:cloudflare:Construct:test-common-stack$cloudflare:index/pagesDomain:PagesDomain::test-common-stack-site-domain' + 'urn:pulumi:stack::project::cloudflare:test-common-stack$cloudflare:index/pagesDomain:PagesDomain::test-common-stack-site-domain' ) expect(accountId).toEqual('123456789012') expect(name).toEqual('test.app.gradientedge.io') @@ -171,7 +171,7 @@ describe('TestCloudflarePagesStaticSite', () => { .apply(([id, urn, name, ttl, type, content, zoneId]) => { expect(id).toEqual('test-common-stack-site-record-id') expect(urn).toEqual( - 'urn:pulumi:stack::project::custom:cloudflare:Construct:test-common-stack$cloudflare:index/dnsRecord:DnsRecord::test-common-stack-site-record' + 'urn:pulumi:stack::project::cloudflare:test-common-stack$cloudflare:index/dnsRecord:DnsRecord::test-common-stack-site-record' ) expect(name).toEqual('test.app') expect(ttl).toEqual(300) diff --git a/src/test/cloudflare/construct/worker-site.test.ts b/src/test/cloudflare/construct/worker-site.test.ts index 272a2e48..0a178729 100644 --- a/src/test/cloudflare/construct/worker-site.test.ts +++ b/src/test/cloudflare/construct/worker-site.test.ts @@ -101,7 +101,7 @@ describe('TestCloudflareWorkerSite', () => { .apply(([id, urn, name, account]) => { expect(id).toEqual('test-common-stack-zone-id') expect(urn).toEqual( - 'urn:pulumi:stack::project::custom:cloudflare:Construct:test-common-stack$cloudflare:index/zone:Zone::test-common-stack-zone' + 'urn:pulumi:stack::project::cloudflare:test-common-stack$cloudflare:index/zone:Zone::test-common-stack-zone' ) expect(name).toEqual('gradientedge.io') expect(account.id).toEqual('test-account') @@ -124,7 +124,7 @@ describe('TestCloudflareWorkerSite', () => { .apply(([id, urn, accountId, bindings, content, scriptName]) => { expect(id).toEqual('test-common-stack-worker-script-id') expect(urn).toEqual( - 'urn:pulumi:stack::project::custom:cloudflare:Construct:test-common-stack$cloudflare:index/workersScript:WorkersScript::test-common-stack-worker-script' + 'urn:pulumi:stack::project::cloudflare:test-common-stack$cloudflare:index/workersScript:WorkersScript::test-common-stack-worker-script' ) expect(accountId).toEqual('test-account') expect(bindings).toEqual([]) @@ -149,7 +149,7 @@ describe('TestCloudflareWorkerSite', () => { .apply(([id, urn, accountId, hostname, service, zoneId]) => { expect(id).toEqual('test-common-stack-worker-domain-id') expect(urn).toEqual( - 'urn:pulumi:stack::project::custom:cloudflare:Construct:test-common-stack$cloudflare:index/workersCustomDomain:WorkersCustomDomain::test-common-stack-worker-domain' + 'urn:pulumi:stack::project::cloudflare:test-common-stack$cloudflare:index/workersCustomDomain:WorkersCustomDomain::test-common-stack-worker-domain' ) expect(accountId).toEqual('test-account') expect(hostname).toEqual('test.app.gradientedge.io') @@ -172,7 +172,7 @@ describe('TestCloudflareWorkerSite', () => { .apply(([id, urn, name, rules]) => { expect(id).toEqual('test-common-stack-rule-id') expect(urn).toEqual( - 'urn:pulumi:stack::project::custom:cloudflare:Construct:test-common-stack$cloudflare:index/ruleset:Ruleset::test-common-stack-rule' + 'urn:pulumi:stack::project::cloudflare:test-common-stack$cloudflare:index/ruleset:Ruleset::test-common-stack-rule' ) expect(name).toEqual('testRuleSet') expect(rules).toEqual({ @@ -196,7 +196,7 @@ describe('TestCloudflareWorkerSite', () => { .apply(([id, urn, settingId, value, zoneId]) => { expect(id).toEqual('test-common-stack-zone-setting-id') expect(urn).toEqual( - 'urn:pulumi:stack::project::custom:cloudflare:Construct:test-common-stack$cloudflare:index/zoneSetting:ZoneSetting::test-common-stack-zone-setting' + 'urn:pulumi:stack::project::cloudflare:test-common-stack$cloudflare:index/zoneSetting:ZoneSetting::test-common-stack-zone-setting' ) expect(settingId).toEqual('always_online') expect(value).toEqual('on') diff --git a/src/test/cloudflare/services/access-manager.test.ts b/src/test/cloudflare/services/access-manager.test.ts index 01ccaa31..77200d4d 100644 --- a/src/test/cloudflare/services/access-manager.test.ts +++ b/src/test/cloudflare/services/access-manager.test.ts @@ -224,7 +224,7 @@ describe('TestCloudflareAccessManager', () => { .apply(([id, urn, name, account]) => { expect(id).toEqual('test-zone-dev-id') expect(urn).toEqual( - 'urn:pulumi:stack::project::custom:cloudflare:Construct:test-common-stack$cloudflare:index/zone:Zone::test-zone-dev' + 'urn:pulumi:stack::project::cloudflare:test-common-stack$cloudflare:index/zone:Zone::test-zone-dev' ) expect(name).toEqual('gradientedge.io') expect(account.id).toEqual('test-account') @@ -249,7 +249,7 @@ describe('TestCloudflareAccessManager', () => { .apply(([id, urn, name, domain, sessionDuration, type, zoneId, corsHeaders]) => { expect(id).toEqual('test-access-app-dev-id') expect(urn).toEqual( - 'urn:pulumi:stack::project::custom:cloudflare:Construct:test-common-stack$cloudflare:index/zeroTrustAccessApplication:ZeroTrustAccessApplication::test-access-app-dev' + 'urn:pulumi:stack::project::cloudflare:test-common-stack$cloudflare:index/zeroTrustAccessApplication:ZeroTrustAccessApplication::test-access-app-dev' ) expect(name).toEqual('test-app-dev') expect(domain).toEqual('myapp-gradientedge.io') @@ -280,7 +280,7 @@ describe('TestCloudflareAccessManager', () => { .apply(([id, urn, accountId, appId, zoneId]) => { expect(id).toEqual('test-access-ca-cert-dev-id') expect(urn).toEqual( - 'urn:pulumi:stack::project::custom:cloudflare:Construct:test-common-stack$cloudflare:index/zeroTrustAccessShortLivedCertificate:ZeroTrustAccessShortLivedCertificate::test-access-ca-cert-dev' + 'urn:pulumi:stack::project::cloudflare:test-common-stack$cloudflare:index/zeroTrustAccessShortLivedCertificate:ZeroTrustAccessShortLivedCertificate::test-access-ca-cert-dev' ) expect(appId).toEqual('test-access-app-dev-id') expect(zoneId).toEqual('test-access-ca-cert-dev-data-zone') @@ -302,7 +302,7 @@ describe('TestCloudflareAccessManager', () => { .apply(([id, urn, name, type, customHtml]) => { expect(id).toEqual('test-access-custom-page-dev-id') expect(urn).toEqual( - 'urn:pulumi:stack::project::custom:cloudflare:Construct:test-common-stack$cloudflare:index/zeroTrustAccessCustomPage:ZeroTrustAccessCustomPage::test-access-custom-page-dev' + 'urn:pulumi:stack::project::cloudflare:test-common-stack$cloudflare:index/zeroTrustAccessCustomPage:ZeroTrustAccessCustomPage::test-access-custom-page-dev' ) expect(name).toEqual('403-dev') expect(type).toEqual('forbidden') @@ -327,7 +327,7 @@ describe('TestCloudflareAccessManager', () => { .apply(([id, urn, name, zoneId, includes]) => { expect(id).toEqual('test-access-grp-dev-id') expect(urn).toEqual( - 'urn:pulumi:stack::project::custom:cloudflare:Construct:test-common-stack$cloudflare:index/zeroTrustAccessGroup:ZeroTrustAccessGroup::test-access-grp-dev' + 'urn:pulumi:stack::project::cloudflare:test-common-stack$cloudflare:index/zeroTrustAccessGroup:ZeroTrustAccessGroup::test-access-grp-dev' ) expect(includes).toEqual([ { @@ -356,7 +356,7 @@ describe('TestCloudflareAccessManager', () => { .apply(([id, urn, name, type, zoneId]) => { expect(id).toEqual('test-access-idp-otp-dev-id') expect(urn).toEqual( - 'urn:pulumi:stack::project::custom:cloudflare:Construct:test-common-stack$cloudflare:index/zeroTrustAccessIdentityProvider:ZeroTrustAccessIdentityProvider::test-access-idp-otp-dev' + 'urn:pulumi:stack::project::cloudflare:test-common-stack$cloudflare:index/zeroTrustAccessIdentityProvider:ZeroTrustAccessIdentityProvider::test-access-idp-otp-dev' ) expect(name).toEqual('test-idp-otp-dev') expect(type).toEqual('onetimepin') @@ -379,7 +379,7 @@ describe('TestCloudflareAccessManager', () => { .apply(([id, urn, name, type, zoneId]) => { expect(id).toEqual('test-access-idp-saml-dev-id') expect(urn).toEqual( - 'urn:pulumi:stack::project::custom:cloudflare:Construct:test-common-stack$cloudflare:index/zeroTrustAccessIdentityProvider:ZeroTrustAccessIdentityProvider::test-access-idp-saml-dev' + 'urn:pulumi:stack::project::cloudflare:test-common-stack$cloudflare:index/zeroTrustAccessIdentityProvider:ZeroTrustAccessIdentityProvider::test-access-idp-saml-dev' ) expect(name).toEqual('test-idp-saml-dev') expect(type).toEqual('saml') @@ -403,7 +403,7 @@ describe('TestCloudflareAccessManager', () => { .apply(([id, urn, name, zoneId, associatedHostnames, certificate]) => { expect(id).toEqual('test-access-mtls-dev-id') expect(urn).toEqual( - 'urn:pulumi:stack::project::custom:cloudflare:Construct:test-common-stack$cloudflare:index/zeroTrustAccessMtlsCertificate:ZeroTrustAccessMtlsCertificate::test-access-mtls-dev' + 'urn:pulumi:stack::project::cloudflare:test-common-stack$cloudflare:index/zeroTrustAccessMtlsCertificate:ZeroTrustAccessMtlsCertificate::test-access-mtls-dev' ) expect(name).toEqual('test-mtls-cert-dev') expect(zoneId).toEqual('test-access-mtls-dev-data-zone') @@ -433,7 +433,7 @@ describe('TestCloudflareAccessManager', () => { ([id, urn, name, zoneId, authDomain, autoRedirectToIdentity, isUiReadOnly, userSeatExpirationInactiveTime]) => { expect(id).toEqual('test-access-org-dev-id') expect(urn).toEqual( - 'urn:pulumi:stack::project::custom:cloudflare:Construct:test-common-stack$cloudflare:index/zeroTrustOrganization:ZeroTrustOrganization::test-access-org-dev' + 'urn:pulumi:stack::project::cloudflare:test-common-stack$cloudflare:index/zeroTrustOrganization:ZeroTrustOrganization::test-access-org-dev' ) expect(name).toEqual('test-org-dev') expect(zoneId).toEqual('test-access-org-dev-data-zone') @@ -461,7 +461,7 @@ describe('TestCloudflareAccessManager', () => { .apply(([id, urn, name, decision, includes, requires]) => { expect(id).toEqual('test-access-policy-dev-id') expect(urn).toEqual( - 'urn:pulumi:stack::project::custom:cloudflare:Construct:test-common-stack$cloudflare:index/zeroTrustAccessPolicy:ZeroTrustAccessPolicy::test-access-policy-dev' + 'urn:pulumi:stack::project::cloudflare:test-common-stack$cloudflare:index/zeroTrustAccessPolicy:ZeroTrustAccessPolicy::test-access-policy-dev' ) expect(name).toEqual('test-policy-props-dev') expect(decision).toEqual('allow') @@ -497,7 +497,7 @@ describe('TestCloudflareAccessManager', () => { .apply(([id, urn, mode, zoneId, notes]) => { expect(id).toEqual('test-access-rule-ch-dev-id') expect(urn).toEqual( - 'urn:pulumi:stack::project::custom:cloudflare:Construct:test-common-stack$cloudflare:index/accessRule:AccessRule::test-access-rule-ch-dev' + 'urn:pulumi:stack::project::cloudflare:test-common-stack$cloudflare:index/accessRule:AccessRule::test-access-rule-ch-dev' ) expect(mode).toEqual('challenge') expect(zoneId).toEqual('test-access-rule-ch-dev-data-zone') @@ -517,7 +517,7 @@ describe('TestCloudflareAccessManager', () => { .apply(([id, urn, mode, zoneId, notes]) => { expect(id).toEqual('test-access-rule-wl-dev-id') expect(urn).toEqual( - 'urn:pulumi:stack::project::custom:cloudflare:Construct:test-common-stack$cloudflare:index/accessRule:AccessRule::test-access-rule-wl-dev' + 'urn:pulumi:stack::project::cloudflare:test-common-stack$cloudflare:index/accessRule:AccessRule::test-access-rule-wl-dev' ) expect(mode).toEqual('whitelist') expect(zoneId).toEqual('test-access-rule-wl-dev-data-zone') @@ -540,7 +540,7 @@ describe('TestCloudflareAccessManager', () => { .apply(([id, urn, name, zoneId, duration]) => { expect(id).toEqual('test-access-ser-token-dev-id') expect(urn).toEqual( - 'urn:pulumi:stack::project::custom:cloudflare:Construct:test-common-stack$cloudflare:index/zeroTrustAccessServiceToken:ZeroTrustAccessServiceToken::test-access-ser-token-dev' + 'urn:pulumi:stack::project::cloudflare:test-common-stack$cloudflare:index/zeroTrustAccessServiceToken:ZeroTrustAccessServiceToken::test-access-ser-token-dev' ) expect(name).toEqual('test-service-token-dev') expect(zoneId).toEqual('test-access-ser-token-dev-data-zone') @@ -557,7 +557,7 @@ describe('TestCloudflareAccessManager', () => { .apply(([id, urn, name]) => { expect(id).toEqual('test-access-tag-dev-id') expect(urn).toEqual( - 'urn:pulumi:stack::project::custom:cloudflare:Construct:test-common-stack$cloudflare:index/zeroTrustAccessTag:ZeroTrustAccessTag::test-access-tag-dev' + 'urn:pulumi:stack::project::cloudflare:test-common-stack$cloudflare:index/zeroTrustAccessTag:ZeroTrustAccessTag::test-access-tag-dev' ) expect(name).toEqual('test-tag-dev') }) diff --git a/src/test/cloudflare/services/api-shield-manager.test.ts b/src/test/cloudflare/services/api-shield-manager.test.ts index aaf9ad80..5985a56e 100644 --- a/src/test/cloudflare/services/api-shield-manager.test.ts +++ b/src/test/cloudflare/services/api-shield-manager.test.ts @@ -160,7 +160,7 @@ describe('TestCloudflareApiShieldManager', () => { .apply(([id, urn, name, account]) => { expect(id).toEqual('test-zone-dev-id') expect(urn).toEqual( - 'urn:pulumi:stack::project::custom:cloudflare:Construct:test-common-stack$cloudflare:index/zone:Zone::test-zone-dev' + 'urn:pulumi:stack::project::cloudflare:test-common-stack$cloudflare:index/zone:Zone::test-zone-dev' ) expect(name).toEqual('gradientedge.io') expect(account.id).toEqual('test-account') @@ -181,7 +181,7 @@ describe('TestCloudflareApiShieldManager', () => { .apply(([id, urn, authIdCharacteristics, zoneId]) => { expect(id).toEqual('test-api-shield-dev-id') expect(urn).toEqual( - 'urn:pulumi:stack::project::custom:cloudflare:Construct:test-common-stack$cloudflare:index/apiShield:ApiShield::test-api-shield-dev' + 'urn:pulumi:stack::project::cloudflare:test-common-stack$cloudflare:index/apiShield:ApiShield::test-api-shield-dev' ) expect(authIdCharacteristics).toEqual([ { @@ -209,7 +209,7 @@ describe('TestCloudflareApiShieldManager', () => { .apply(([id, urn, file, kind, name, zoneId]) => { expect(id).toEqual('test-api-shield-sch-dev-id') expect(urn).toEqual( - 'urn:pulumi:stack::project::custom:cloudflare:Construct:test-common-stack$cloudflare:index/apiShieldSchema:ApiShieldSchema::test-api-shield-sch-dev' + 'urn:pulumi:stack::project::cloudflare:test-common-stack$cloudflare:index/apiShieldSchema:ApiShieldSchema::test-api-shield-sch-dev' ) expect(file).toEqual('{\n "test": true,\n "hello": "world"\n}\n') expect(kind).toEqual('openapi_v3') @@ -233,7 +233,7 @@ describe('TestCloudflareApiShieldManager', () => { .apply(([id, urn, validationDefaultMitigationAction, validationOverrideMitigationAction, zoneId]) => { expect(id).toEqual('test-api-shield-val-dev-id') expect(urn).toEqual( - 'urn:pulumi:stack::project::custom:cloudflare:Construct:test-common-stack$cloudflare:index/apiShieldSchemaValidationSettings:ApiShieldSchemaValidationSettings::test-api-shield-val-dev' + 'urn:pulumi:stack::project::cloudflare:test-common-stack$cloudflare:index/apiShieldSchemaValidationSettings:ApiShieldSchemaValidationSettings::test-api-shield-val-dev' ) expect(validationDefaultMitigationAction).toEqual('log') expect(validationOverrideMitigationAction).toEqual('none') @@ -257,7 +257,7 @@ describe('TestCloudflareApiShieldManager', () => { .apply(([id, urn, endpoint, host, method, zoneId]) => { expect(id).toEqual('test-api-shield-op-dev-id') expect(urn).toEqual( - 'urn:pulumi:stack::project::custom:cloudflare:Construct:test-common-stack$cloudflare:index/apiShieldOperation:ApiShieldOperation::test-api-shield-op-dev' + 'urn:pulumi:stack::project::cloudflare:test-common-stack$cloudflare:index/apiShieldOperation:ApiShieldOperation::test-api-shield-op-dev' ) expect(endpoint).toEqual('/product') expect(host).toEqual('api.gradientedge.io') @@ -281,7 +281,7 @@ describe('TestCloudflareApiShieldManager', () => { .apply(([id, urn, mitigationAction, operationId, zoneId]) => { expect(id).toEqual('test-api-shield-op-val-dev-id') expect(urn).toEqual( - 'urn:pulumi:stack::project::custom:cloudflare:Construct:test-common-stack$cloudflare:index/apiShieldOperationSchemaValidationSettings:ApiShieldOperationSchemaValidationSettings::test-api-shield-op-val-dev' + 'urn:pulumi:stack::project::cloudflare:test-common-stack$cloudflare:index/apiShieldOperationSchemaValidationSettings:ApiShieldOperationSchemaValidationSettings::test-api-shield-op-val-dev' ) expect(mitigationAction).toEqual('block') expect(operationId).toEqual('test-api-shield-op-dev-id') diff --git a/src/test/cloudflare/services/argo-manager.test.ts b/src/test/cloudflare/services/argo-manager.test.ts index bf7f295d..56e747ea 100644 --- a/src/test/cloudflare/services/argo-manager.test.ts +++ b/src/test/cloudflare/services/argo-manager.test.ts @@ -110,7 +110,7 @@ describe('TestCloudflareArgoManager', () => { .apply(([id, urn, name, account]) => { expect(id).toEqual('test-zone-dev-id') expect(urn).toEqual( - 'urn:pulumi:stack::project::custom:cloudflare:Construct:test-common-stack$cloudflare:index/zone:Zone::test-zone-dev' + 'urn:pulumi:stack::project::cloudflare:test-common-stack$cloudflare:index/zone:Zone::test-zone-dev' ) expect(name).toEqual('gradientedge.io') expect(account.id).toEqual('test-account') @@ -130,7 +130,7 @@ describe('TestCloudflareArgoManager', () => { .apply(([id, urn, value]) => { expect(id).toEqual('test-argo-dev-id') expect(urn).toEqual( - 'urn:pulumi:stack::project::custom:cloudflare:Construct:test-common-stack$cloudflare:index/argoSmartRouting:ArgoSmartRouting::test-argo-dev' + 'urn:pulumi:stack::project::cloudflare:test-common-stack$cloudflare:index/argoSmartRouting:ArgoSmartRouting::test-argo-dev' ) expect(value).toEqual('on') }) @@ -149,7 +149,7 @@ describe('TestCloudflareArgoManager', () => { .apply(([id, urn, value]) => { expect(id).toEqual('test-argo-tiered-caching-dev-id') expect(urn).toEqual( - 'urn:pulumi:stack::project::custom:cloudflare:Construct:test-common-stack$cloudflare:index/argoTieredCaching:ArgoTieredCaching::test-argo-tiered-caching-dev' + 'urn:pulumi:stack::project::cloudflare:test-common-stack$cloudflare:index/argoTieredCaching:ArgoTieredCaching::test-argo-tiered-caching-dev' ) expect(value).toEqual('on') }) diff --git a/src/test/cloudflare/services/firewall-manager.test.ts b/src/test/cloudflare/services/firewall-manager.test.ts index efd64d06..97fe9d8b 100644 --- a/src/test/cloudflare/services/firewall-manager.test.ts +++ b/src/test/cloudflare/services/firewall-manager.test.ts @@ -106,7 +106,7 @@ describe('TestCloudflareFirewallManager', () => { .apply(([id, urn, name, account]) => { expect(id).toEqual('test-zone-dev-id') expect(urn).toEqual( - 'urn:pulumi:stack::project::custom:cloudflare:Construct:test-common-stack$cloudflare:index/zone:Zone::test-zone-dev' + 'urn:pulumi:stack::project::cloudflare:test-common-stack$cloudflare:index/zone:Zone::test-zone-dev' ) expect(name).toEqual('gradientedge.io') expect(account.id).toEqual('test-account') @@ -127,7 +127,7 @@ describe('TestCloudflareFirewallManager', () => { .apply(([id, urn, bodies, expression]) => { expect(id).toEqual('test-filter-dev-id') expect(urn).toEqual( - 'urn:pulumi:stack::project::custom:cloudflare:Construct:test-common-stack$cloudflare:index/filter:Filter::test-filter-dev' + 'urn:pulumi:stack::project::cloudflare:test-common-stack$cloudflare:index/filter:Filter::test-filter-dev' ) expect(bodies).toEqual([ { @@ -154,7 +154,7 @@ describe('TestCloudflareFirewallManager', () => { .apply(([id, urn, filter, zoneId]) => { expect(id).toEqual('test-firewall-rule-dev-id') expect(urn).toEqual( - 'urn:pulumi:stack::project::custom:cloudflare:Construct:test-common-stack$cloudflare:index/firewallRule:FirewallRule::test-firewall-rule-dev' + 'urn:pulumi:stack::project::cloudflare:test-common-stack$cloudflare:index/firewallRule:FirewallRule::test-firewall-rule-dev' ) expect(filter).toEqual({ bodies: [ diff --git a/src/test/cloudflare/services/page-manager.test.ts b/src/test/cloudflare/services/page-manager.test.ts index e4effca5..e81bc559 100644 --- a/src/test/cloudflare/services/page-manager.test.ts +++ b/src/test/cloudflare/services/page-manager.test.ts @@ -117,7 +117,7 @@ describe('TestCloudflarePagesManager', () => { .apply(([id, urn, accountId, name, productionBranch]) => { expect(id).toEqual('test-pages-project-dev-id') expect(urn).toEqual( - 'urn:pulumi:stack::project::custom:cloudflare:Construct:test-common-stack$cloudflare:index/pagesProject:PagesProject::test-pages-project-dev' + 'urn:pulumi:stack::project::cloudflare:test-common-stack$cloudflare:index/pagesProject:PagesProject::test-pages-project-dev' ) expect(accountId).toEqual('123456789012') expect(name).toEqual('test-simple-project-dev') @@ -140,7 +140,7 @@ describe('TestCloudflarePagesManager', () => { .apply(([id, urn, accountId, name, productionBranch, buildConfig, deploymentConfigs]) => { expect(id).toEqual('test-pages-project-with-build-dev-id') expect(urn).toEqual( - 'urn:pulumi:stack::project::custom:cloudflare:Construct:test-common-stack$cloudflare:index/pagesProject:PagesProject::test-pages-project-with-build-dev' + 'urn:pulumi:stack::project::cloudflare:test-common-stack$cloudflare:index/pagesProject:PagesProject::test-pages-project-with-build-dev' ) expect(accountId).toEqual('123456789012') expect(name).toEqual('test-build-config-project-dev') @@ -198,7 +198,7 @@ describe('TestCloudflarePagesManager', () => { .apply(([id, urn, accountId, name, projectName]) => { expect(id).toEqual('test-pages-domain-dev-id') expect(urn).toEqual( - 'urn:pulumi:stack::project::custom:cloudflare:Construct:test-common-stack$cloudflare:index/pagesDomain:PagesDomain::test-pages-domain-dev' + 'urn:pulumi:stack::project::cloudflare:test-common-stack$cloudflare:index/pagesDomain:PagesDomain::test-pages-domain-dev' ) expect(accountId).toEqual('123456789012') expect(name).toEqual('gradientedge.io') @@ -222,7 +222,7 @@ describe('TestCloudflarePagesManager', () => { .apply(([id, urn, actions, priority, target, zoneId]) => { expect(id).toEqual('test-page-rule-dev-id') expect(urn).toEqual( - 'urn:pulumi:stack::project::custom:cloudflare:Construct:test-common-stack$cloudflare:index/pageRule:PageRule::test-page-rule-dev' + 'urn:pulumi:stack::project::cloudflare:test-common-stack$cloudflare:index/pageRule:PageRule::test-page-rule-dev' ) expect(actions).toEqual({ emailObfuscation: 'on', diff --git a/src/test/cloudflare/services/record-manager.test.ts b/src/test/cloudflare/services/record-manager.test.ts index dd76fd9c..15aa14eb 100644 --- a/src/test/cloudflare/services/record-manager.test.ts +++ b/src/test/cloudflare/services/record-manager.test.ts @@ -102,7 +102,7 @@ describe('TestCloudflareRecordManager', () => { .apply(([id, urn, name, account]) => { expect(id).toEqual('test-zone-dev-id') expect(urn).toEqual( - 'urn:pulumi:stack::project::custom:cloudflare:Construct:test-common-stack$cloudflare:index/zone:Zone::test-zone-dev' + 'urn:pulumi:stack::project::cloudflare:test-common-stack$cloudflare:index/zone:Zone::test-zone-dev' ) expect(name).toEqual('gradientedge.io') expect(account.id).toEqual('test-account') @@ -126,7 +126,7 @@ describe('TestCloudflareRecordManager', () => { .apply(([id, urn, name, ttl, type, content, zoneId]) => { expect(id).toEqual('test-arecord-dev-id') expect(urn).toEqual( - 'urn:pulumi:stack::project::custom:cloudflare:Construct:test-common-stack$cloudflare:index/dnsRecord:DnsRecord::test-arecord-dev' + 'urn:pulumi:stack::project::cloudflare:test-common-stack$cloudflare:index/dnsRecord:DnsRecord::test-arecord-dev' ) expect(name).toEqual('testARecord') expect(ttl).toEqual(300) @@ -151,7 +151,7 @@ describe('TestCloudflareRecordManager', () => { .apply(([id, urn, name, ttl, type, content, zoneId]) => { expect(id).toEqual('test-cnamerecord-dev-id') expect(urn).toEqual( - 'urn:pulumi:stack::project::custom:cloudflare:Construct:test-common-stack$cloudflare:index/dnsRecord:DnsRecord::test-cnamerecord-dev' + 'urn:pulumi:stack::project::cloudflare:test-common-stack$cloudflare:index/dnsRecord:DnsRecord::test-cnamerecord-dev' ) expect(name).toEqual('testCNameRecord') expect(ttl).toEqual(300) diff --git a/src/test/cloudflare/services/rule-set-manager.test.ts b/src/test/cloudflare/services/rule-set-manager.test.ts index d26584fe..7dcaad22 100644 --- a/src/test/cloudflare/services/rule-set-manager.test.ts +++ b/src/test/cloudflare/services/rule-set-manager.test.ts @@ -95,7 +95,7 @@ describe('TestCloudflareRuleSetManager', () => { .apply(([id, urn, name, account]) => { expect(id).toEqual('test-zone-dev-id') expect(urn).toEqual( - 'urn:pulumi:stack::project::custom:cloudflare:Construct:test-common-stack$cloudflare:index/zone:Zone::test-zone-dev' + 'urn:pulumi:stack::project::cloudflare:test-common-stack$cloudflare:index/zone:Zone::test-zone-dev' ) expect(name).toEqual('gradientedge.io') expect(account.id).toEqual('test-account') @@ -116,7 +116,7 @@ describe('TestCloudflareRuleSetManager', () => { .apply(([id, urn, name, rules]) => { expect(id).toEqual('test-rule-set-dev-id') expect(urn).toEqual( - 'urn:pulumi:stack::project::custom:cloudflare:Construct:test-common-stack$cloudflare:index/ruleset:Ruleset::test-rule-set-dev' + 'urn:pulumi:stack::project::cloudflare:test-common-stack$cloudflare:index/ruleset:Ruleset::test-rule-set-dev' ) expect(name).toEqual('testRuleSet') expect(rules).toEqual({ diff --git a/src/test/cloudflare/services/worker-manager.test.ts b/src/test/cloudflare/services/worker-manager.test.ts index a61785b9..ed5ba7ab 100644 --- a/src/test/cloudflare/services/worker-manager.test.ts +++ b/src/test/cloudflare/services/worker-manager.test.ts @@ -155,7 +155,7 @@ describe('TestCloudflareWorkerManager', () => { .apply(([id, urn, name, account]) => { expect(id).toEqual('test-zone-dev-id') expect(urn).toEqual( - 'urn:pulumi:stack::project::custom:cloudflare:Construct:test-common-stack$cloudflare:index/zone:Zone::test-zone-dev' + 'urn:pulumi:stack::project::cloudflare:test-common-stack$cloudflare:index/zone:Zone::test-zone-dev' ) expect(name).toEqual('gradientedge.io') expect(account.id).toEqual('test-account') @@ -178,7 +178,7 @@ describe('TestCloudflareWorkerManager', () => { .apply(([id, urn, accountId, hostname, service, zoneId]) => { expect(id).toEqual('test-worker-domain-dev-id') expect(urn).toEqual( - 'urn:pulumi:stack::project::custom:cloudflare:Construct:test-common-stack$cloudflare:index/workersCustomDomain:WorkersCustomDomain::test-worker-domain-dev' + 'urn:pulumi:stack::project::cloudflare:test-common-stack$cloudflare:index/workersCustomDomain:WorkersCustomDomain::test-worker-domain-dev' ) expect(accountId).toEqual('test-account') expect(hostname).toEqual('test.gradientedge.io') diff --git a/src/test/cloudflare/services/zone-manager.test.ts b/src/test/cloudflare/services/zone-manager.test.ts index 14a1449a..f3bb4bd7 100644 --- a/src/test/cloudflare/services/zone-manager.test.ts +++ b/src/test/cloudflare/services/zone-manager.test.ts @@ -137,7 +137,7 @@ describe('TestCloudflareZoneManager', () => { .apply(([id, urn, name, account]) => { expect(id).toEqual('test-zone-dev-id') expect(urn).toEqual( - 'urn:pulumi:stack::project::custom:cloudflare:Construct:test-common-stack$cloudflare:index/zone:Zone::test-zone-dev' + 'urn:pulumi:stack::project::cloudflare:test-common-stack$cloudflare:index/zone:Zone::test-zone-dev' ) expect(name).toEqual('gradientedge.io') expect(account.id).toEqual('test-account') @@ -157,7 +157,7 @@ describe('TestCloudflareZoneManager', () => { .apply(([id, urn, zoneId]) => { expect(id).toEqual('test-zone-cache-reserve-dev-id') expect(urn).toEqual( - 'urn:pulumi:stack::project::custom:cloudflare:Construct:test-common-stack$cloudflare:index/zoneCacheReserve:ZoneCacheReserve::test-zone-cache-reserve-dev' + 'urn:pulumi:stack::project::cloudflare:test-common-stack$cloudflare:index/zoneCacheReserve:ZoneCacheReserve::test-zone-cache-reserve-dev' ) expect(zoneId).toEqual('test-zone-dev-id') }) @@ -177,7 +177,7 @@ describe('TestCloudflareZoneManager', () => { .apply(([id, urn, value, zoneId]) => { expect(id).toEqual('test-zone-cache-variants-dev-id') expect(urn).toEqual( - 'urn:pulumi:stack::project::custom:cloudflare:Construct:test-common-stack$cloudflare:index/zoneCacheVariants:ZoneCacheVariants::test-zone-cache-variants-dev' + 'urn:pulumi:stack::project::cloudflare:test-common-stack$cloudflare:index/zoneCacheVariants:ZoneCacheVariants::test-zone-cache-variants-dev' ) expect(value).toEqual({ avif: ['image/avif', 'image/webp'],