From 496a219bd69df474b54ff0232c70414f074b897b Mon Sep 17 00:00:00 2001 From: Steven Hoang Date: Mon, 18 Mar 2024 16:27:34 +0800 Subject: [PATCH] remove default tags --- .github/workflows/build-publish-drunk.yml | 5 +++-- package.json | 2 +- src/Aks/Helper.ts | 14 +++++++------- src/Aks/index.ts | 2 -- src/Apim/index.ts | 4 +--- src/Apps/LogicApp.ts | 5 +---- src/Automation/AutoAccount.ts | 4 ++-- src/AzAd/ManagedIdentity.ts | 3 +-- src/Cdn/index.ts | 3 +-- src/Common/AzureEnv.ts | 7 ++----- src/Core/ResourceCreator.ts | 6 +++--- src/CosmosDb/index.ts | 22 ++++------------------ src/IOT/Hub/index.ts | 3 +-- src/KeyVault/index.ts | 2 -- src/Logs/LogAnalytics.ts | 3 +-- src/ServiceBus/index.ts | 3 +-- src/SignalR/index.ts | 5 ++--- src/Sql/SqlDb.ts | 3 +-- src/Sql/index.ts | 4 +--- src/Storage/index.ts | 4 +--- src/VM/index.ts | 3 +-- src/VNet/Bastion.ts | 3 --- src/VNet/Firewall.ts | 3 +-- src/VNet/FirewallPolicy.ts | 2 -- src/VNet/IpAddress.ts | 5 +---- src/VNet/PrivateEndpoint.ts | 4 ---- src/VNet/Vnet.ts | 3 --- src/Web/AppCertOrder.ts | 4 ---- src/Web/AppConfig.ts | 2 -- src/Web/FuncApp.ts | 2 -- 30 files changed, 37 insertions(+), 98 deletions(-) diff --git a/.github/workflows/build-publish-drunk.yml b/.github/workflows/build-publish-drunk.yml index 3db460c2..fe797daf 100644 --- a/.github/workflows/build-publish-drunk.yml +++ b/.github/workflows/build-publish-drunk.yml @@ -53,8 +53,9 @@ jobs: - run: npm ci -# - name: Run Lints -# run: npm run lint + - name: Run Lints + continue-on-error: true + run: npm run lint #Fix node_modules/openpgp/openpgp.d.ts:10:46 - error # - name: Replace text in file diff --git a/package.json b/package.json index 023f0ca3..fcd1297c 100644 --- a/package.json +++ b/package.json @@ -33,7 +33,7 @@ "test": "cross-env TS_NODE_PROJECT='./tsconfig.test.json' mocha --timeout 10000 -r ts-node/register 'z_tests/**/*.test.ts'", "testcert": "cross-env TS_NODE_PROJECT='./tsconfig.test.json' mocha --timeout 10000 -r ts-node/register '**/*.ts'", "test-cover": "cross-env TS_NODE_PROJECT='./tsconfig.test.json' nyc mocha --timeout 10000 -r ts-node/register 'z_tests/**/*.ts'", - "lint": "eslint **/*.ts --fix" + "lint": "eslint src/**/*.ts --fix" }, "devDependencies": { "@types/chai": "^4.3.12", diff --git a/src/Aks/Helper.ts b/src/Aks/Helper.ts index 95d2d1a1..f101e454 100644 --- a/src/Aks/Helper.ts +++ b/src/Aks/Helper.ts @@ -65,13 +65,13 @@ export const getAksIdentitySecrets = ({ return getIdentitySecrets({ name, vaultInfo }); }; -interface AksProps { - aksName: string; - formatedName?: boolean; - namespace?: string; - groupName: string; - localAccountDisabled?: boolean; -} +// interface AksProps { +// aksName: string; +// formatedName?: boolean; +// namespace?: string; +// groupName: string; +// localAccountDisabled?: boolean; +// } // /** Get AKS Provider from Managed Cluster*/ // export const createAksProvider = async ({ diff --git a/src/Aks/index.ts b/src/Aks/index.ts index 634adc6b..745d4327 100644 --- a/src/Aks/index.ts +++ b/src/Aks/index.ts @@ -6,7 +6,6 @@ import { BasicMonitorArgs, BasicResourceArgs, KeyVaultInfo } from '../types'; import { currentEnv, defaultScope, - defaultTags, Environments, getResourceIdFromInfo, getResourceInfoFromId, @@ -501,7 +500,6 @@ export default async ({ : undefined, }, - tags: defaultTags, }, { protect: lock, diff --git a/src/Apim/index.ts b/src/Apim/index.ts index 2094326d..a6ee805e 100644 --- a/src/Apim/index.ts +++ b/src/Apim/index.ts @@ -1,7 +1,5 @@ import * as apimanagement from '@pulumi/azure-native/apimanagement'; import { Input } from '@pulumi/pulumi'; - -import { defaultTags } from '../Common/AzureEnv'; import { getApimName } from '../Common/Naming'; import { organization } from '../Common/StackEnv'; import { randomUuId } from '../Core/Random'; @@ -125,7 +123,7 @@ export default ({ "Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Protocols.Tls11": "false", }, - tags: defaultTags, + lock, ...others, ignoreChanges: [], diff --git a/src/Apps/LogicApp.ts b/src/Apps/LogicApp.ts index 5422919f..17cbff37 100644 --- a/src/Apps/LogicApp.ts +++ b/src/Apps/LogicApp.ts @@ -1,9 +1,6 @@ import * as logic from '@pulumi/azure-native/logic'; - import { BasicResourceArgs, DefaultResourceArgs } from '../types'; - import creator from '../Core/ResourceCreator'; -import { defaultTags } from '../Common/AzureEnv'; import { global } from '../Common'; import { getCertOrderName } from '../Common/Naming'; @@ -17,7 +14,7 @@ export default ({ name, ...others }: Props) => { ...global.groupInfo, ...others, sku: '', - tags: defaultTags, + } as logic.WorkflowArgs & DefaultResourceArgs); return order; diff --git a/src/Automation/AutoAccount.ts b/src/Automation/AutoAccount.ts index 2503606e..a2a83ee2 100644 --- a/src/Automation/AutoAccount.ts +++ b/src/Automation/AutoAccount.ts @@ -1,7 +1,7 @@ import { BasicResourceArgs } from '../types'; import * as automation from '@pulumi/azure-native/automation'; import { getAutomationAccountName } from '../Common/Naming'; -import { defaultTags } from '../Common/AzureEnv'; + interface Props extends BasicResourceArgs {} @@ -18,6 +18,6 @@ export default ({ name, group }: Props) => { sku: { name: 'Free', //Free, Basic }, - tags: defaultTags, + }); }; diff --git a/src/AzAd/ManagedIdentity.ts b/src/AzAd/ManagedIdentity.ts index 4b499d2d..2794b99b 100644 --- a/src/AzAd/ManagedIdentity.ts +++ b/src/AzAd/ManagedIdentity.ts @@ -1,7 +1,6 @@ import { BasicResourceArgs } from "../types"; import * as azure from "@pulumi/azure-native"; import { getManagedIdentityName } from "../Common/Naming"; -import { defaultTags } from "../Common/AzureEnv"; import Locker from "../Core/Locker"; interface Props extends BasicResourceArgs { @@ -13,7 +12,7 @@ export default ({ name, group, lock }: Props) => { const managedIdentity = new azure.managedidentity.UserAssignedIdentity(n, { resourceName: n, ...group, - tags: defaultTags, + }); if (lock) { diff --git a/src/Cdn/index.ts b/src/Cdn/index.ts index 2744873b..70db8561 100644 --- a/src/Cdn/index.ts +++ b/src/Cdn/index.ts @@ -3,7 +3,6 @@ import * as cdn from '@pulumi/azure-native/cdn'; import * as azureAd from '@pulumi/azuread'; import { getCdnProfileName } from '../Common/Naming'; import { global } from '../Common'; -import { defaultTags } from '../Common/AzureEnv'; import { grantVaultRbacPermission } from '../KeyVault/VaultPermissions'; interface Props { @@ -27,7 +26,7 @@ export default ({ ...group, location: 'global', sku: { name: cdn.SkuName.Standard_Microsoft }, - tags: defaultTags, + }); if (vaultAccess) { diff --git a/src/Common/AzureEnv.ts b/src/Common/AzureEnv.ts index 1cc17174..debaf541 100644 --- a/src/Common/AzureEnv.ts +++ b/src/Common/AzureEnv.ts @@ -25,14 +25,11 @@ pulumi.all([subscriptionId, tenantId]).apply(([s, t]) => { }); /** ======== Default Variables ================*/ - -export const defaultTags = { +registerAutoTags({ environment: stack, organization: organization, "pulumi-project": projectName, -}; - -registerAutoTags(defaultTags); +}); export enum Environments { Global = "global", diff --git a/src/Core/ResourceCreator.ts b/src/Core/ResourceCreator.ts index ce3c9633..9a81a2e1 100644 --- a/src/Core/ResourceCreator.ts +++ b/src/Core/ResourceCreator.ts @@ -1,11 +1,11 @@ +/* eslint @typescript-eslint/no-explicit-any: "off" */ + import * as authorization from '@pulumi/azure-native/authorization'; import * as pulumi from '@pulumi/pulumi'; - import { DefaultResourceArgs } from '../types'; import { DiagnosticSetting } from '@pulumi/azure-native/aadiam/diagnosticSetting'; import Locker from './Locker'; import { createDiagnostic } from '../Logs/Helpers'; -import { defaultTags } from '../Common/AzureEnv'; const tryFindName = (props: unknown, isResourceGroup: boolean): string => { const rs = props as { @@ -57,7 +57,7 @@ export default function < const resource = new Class( name, - { name, ...props, tags: defaultTags }, + { name, ...props }, { dependsOn, import: importUri, ignoreChanges, deleteBeforeReplace: true } ); diff --git a/src/CosmosDb/index.ts b/src/CosmosDb/index.ts index 2cc52fcb..c21bf706 100644 --- a/src/CosmosDb/index.ts +++ b/src/CosmosDb/index.ts @@ -2,7 +2,7 @@ import * as documentdb from '@pulumi/azure-native/documentdb'; import { getCosmosDbName } from '../Common/Naming'; import { DefaultResourceArgs, KeyVaultInfo, ResourceGroupInfo } from '../types'; import ResourceCreator from '../Core/ResourceCreator'; -import { defaultTags, isPrd } from '../Common/AzureEnv'; +import { isPrd} from '../Common/AzureEnv'; import { createThreatProtection } from '../Logs/Helpers'; import { Input } from '@pulumi/pulumi'; @@ -10,7 +10,7 @@ interface CosmosDbProps { name: string; group: ResourceGroupInfo; vaultInfo?: KeyVaultInfo; - locations?: Input[]; + locations?: Array>; enableMultipleWriteLocations?: boolean; capabilities?: Array<'EnableCassandra' | 'EnableTable' | 'EnableGremlin'>; kind?: documentdb.DatabaseAccountKind; @@ -51,20 +51,6 @@ export default ({ }: CosmosDbProps) => { name = getCosmosDbName(name); - /** - * The failover priority of the region. A failover priority of 0 indicates a write region. The maximum value for a failover priority = (total number of regions - 1). Failover priority values must be unique for each of the regions in which the database account exists. - */ - //failoverPriority?: pulumi.Input; - /** - * Flag to indicate whether or not this region is an AvailabilityZone region - */ - //isZoneRedundant?: pulumi.Input; - /** - * The name of the region. - */ - //locationName?: pulumi.Input; - if (!locations) locations = [group.location!]; - const { resource } = ResourceCreator(documentdb.DatabaseAccount, { accountName: name, ...group, @@ -76,7 +62,7 @@ export default ({ ? capabilities.map((n) => ({ name: n })) : undefined, - locations: locations?.map((n) => ({ locationName: n })), + locations:locations? locations.map((n) => ({ locationName: n })):[{locationName: group.location}], backupPolicy: isPrd ? { @@ -137,7 +123,7 @@ export default ({ ], metricsCategories: ['Requests'], }, - tags: defaultTags, + } as unknown as documentdb.DatabaseAccountArgs & DefaultResourceArgs); if ( diff --git a/src/IOT/Hub/index.ts b/src/IOT/Hub/index.ts index 9b88d10e..5d8499ea 100644 --- a/src/IOT/Hub/index.ts +++ b/src/IOT/Hub/index.ts @@ -1,7 +1,7 @@ import { BasicResourceArgs, KeyVaultInfo } from '../../types'; import { getIotHubName } from '../../Common/Naming'; import * as devices from '@pulumi/azure-native/devices'; -import { defaultTags, subscriptionId } from '../../Common/AzureEnv'; +import { subscriptionId } from '../../Common/AzureEnv'; import { Input } from '@pulumi/pulumi'; import Locker from '../../Core/Locker'; import { EnvRoleNamesType } from '../../AzAd/EnvRoles'; @@ -124,7 +124,6 @@ export default async ({ ...group, sku, - tags: defaultTags, properties: { //authorizationPolicies: [{}], diff --git a/src/KeyVault/index.ts b/src/KeyVault/index.ts index 883f24a0..277a45fd 100644 --- a/src/KeyVault/index.ts +++ b/src/KeyVault/index.ts @@ -3,7 +3,6 @@ import { enums } from "@pulumi/azure-native/types"; import { Input } from "@pulumi/pulumi"; import { currentPrincipal, - defaultTags, subscriptionId, tenantId, } from "../Common/AzureEnv"; @@ -103,7 +102,6 @@ export default ({ }, }, - tags: defaultTags, }); //Grant RBAC permission diff --git a/src/Logs/LogAnalytics.ts b/src/Logs/LogAnalytics.ts index 02889750..d2ba0c78 100644 --- a/src/Logs/LogAnalytics.ts +++ b/src/Logs/LogAnalytics.ts @@ -1,5 +1,4 @@ import * as operationalinsights from '@pulumi/azure-native/operationalinsights'; -import { defaultTags } from '../Common/AzureEnv'; import { KeyVaultInfo, ResourceGroupInfo } from '../types'; import { getKeyName, getLogWpName } from '../Common/Naming'; import { addCustomSecret } from '../KeyVault/CustomHelper'; @@ -36,7 +35,7 @@ export default ({ retentionInDays: sku === operationalinsights.WorkspaceSkuNameEnum.Free ? 7 : 30, //DO NOT changes this sku: { name: sku }, - tags: defaultTags, + }); if (vaultInfo) { diff --git a/src/ServiceBus/index.ts b/src/ServiceBus/index.ts index 8d107723..12936dc9 100644 --- a/src/ServiceBus/index.ts +++ b/src/ServiceBus/index.ts @@ -19,7 +19,7 @@ import { getTopicName, getTopicOrQueueVaultName, } from './ServiceBusHelper'; -import { defaultTags, isPrd } from '../Common/AzureEnv'; +import { isPrd } from '../Common/AzureEnv'; import creator from '../Core/ResourceCreator'; import { getPrivateEndpointName, getServiceBusName } from '../Common/Naming'; import PrivateEndpoint from '../VNet/PrivateEndpoint'; @@ -519,7 +519,6 @@ export default ({ ...group, sku: { name: sku, tier: sku }, - tags: defaultTags, ...others, monitoring: monitoring diff --git a/src/SignalR/index.ts b/src/SignalR/index.ts index 9f60cd4a..f293abb9 100644 --- a/src/SignalR/index.ts +++ b/src/SignalR/index.ts @@ -1,7 +1,6 @@ import * as native from '@pulumi/azure-native'; import * as pulumi from '@pulumi/pulumi'; - -import { defaultTags, isDev } from '../Common/AzureEnv'; +import { isDev } from '../Common/AzureEnv'; import { getPrivateEndpointName, getSignalRName } from '../Common/Naming'; import { BasicResourceArgs, KeyVaultInfo, PrivateLinkProps } from '../types'; import PrivateEndpoint from '../VNet/PrivateEndpoint'; @@ -81,7 +80,7 @@ export default ({ } : undefined, sku, - tags: defaultTags, + }); let privateEndpoint: native.network.PrivateEndpoint | undefined = undefined; diff --git a/src/Sql/SqlDb.ts b/src/Sql/SqlDb.ts index dbc19110..74375a95 100644 --- a/src/Sql/SqlDb.ts +++ b/src/Sql/SqlDb.ts @@ -3,7 +3,7 @@ import * as sql from '@pulumi/azure-native/sql'; import { BasicResourceArgs, BasicResourceResultProps } from '../types'; import { Input, Output, Resource } from '@pulumi/pulumi'; -import { defaultTags, isPrd } from '../Common/AzureEnv'; +import { isPrd } from '../Common/AzureEnv'; import { getSqlDbName } from '../Common/Naming'; import Locker from '../Core/Locker'; @@ -59,7 +59,6 @@ export default ({ //zoneRedundant: isPrd, requestedBackupStorageRedundancy: isPrd ? 'Zone' : 'Local', - tags: defaultTags, }, { dependsOn } ); diff --git a/src/Sql/index.ts b/src/Sql/index.ts index 0d079aad..a97c15ae 100644 --- a/src/Sql/index.ts +++ b/src/Sql/index.ts @@ -6,7 +6,6 @@ import { getAdGroup } from '../AzAd/Group'; import { roleAssignment } from '../AzAd/RoleAssignment'; import { currentEnv, - defaultTags, isPrd, subscriptionId, tenantId, @@ -179,7 +178,6 @@ export default ({ ? sql.ServerNetworkAccessFlag.Disabled : sql.ServerNetworkAccessFlag.Enabled, - tags: defaultTags, }, { ignoreChanges, @@ -339,7 +337,7 @@ export default ({ vaultInfo, contentType: `Sql ${d.name} Connection String`, dependsOn: d.resource, - tags: defaultTags, + }); } diff --git a/src/Storage/index.ts b/src/Storage/index.ts index 5c7d506f..336bc0a6 100644 --- a/src/Storage/index.ts +++ b/src/Storage/index.ts @@ -4,7 +4,7 @@ import { KeyVaultInfo, BasicResourceArgs } from '../types'; import { Input, output } from '@pulumi/pulumi'; import { createThreatProtection } from '../Logs/Helpers'; import { getSecret } from '../KeyVault/Helper'; -import { defaultTags, isPrd } from '../Common/AzureEnv'; +import { isPrd } from '../Common/AzureEnv'; import cdnCreator from './CdnEndpoint'; import { @@ -186,8 +186,6 @@ export default ({ : undefined, } : { defaultAction: 'Allow' }, - - tags: defaultTags, }); //Soft Delete diff --git a/src/VM/index.ts b/src/VM/index.ts index a70e19bf..86f201f0 100644 --- a/src/VM/index.ts +++ b/src/VM/index.ts @@ -2,7 +2,6 @@ import { Input, Resource } from "@pulumi/pulumi"; import * as native from "@pulumi/azure-native"; import { BasicResourceArgs, KeyVaultInfo } from "../types"; import { getNICName, getVMName } from "../Common/Naming"; -import { defaultTags } from "../Common/AzureEnv"; import Locker from "../Core/Locker"; interface Props extends BasicResourceArgs { @@ -157,7 +156,7 @@ export default ({ // encryptionAtHost: false, // //securityType: native.compute.SecurityTypes.TrustedLaunch, // }, - tags: { ...defaultTags, ...tags }, + tags, }, { dependsOn, diff --git a/src/VNet/Bastion.ts b/src/VNet/Bastion.ts index 06b1a049..3c5bb469 100644 --- a/src/VNet/Bastion.ts +++ b/src/VNet/Bastion.ts @@ -3,7 +3,6 @@ import IpAddress from "./IpAddress"; import * as network from "@pulumi/azure-native/network"; import { Input, Resource } from "@pulumi/pulumi"; import { getBastionName } from "../Common/Naming"; -import { defaultTags } from "../Common/AzureEnv"; interface Props extends BasicResourceArgs { subnetId: Input; @@ -35,8 +34,6 @@ export default ({ name, group, subnetId, dependsOn }: Props) => { privateIPAllocationMethod: network.IPAllocationMethod.Dynamic, }, ], - - tags: defaultTags, }, { dependsOn: dependsOn || ipAddress, deleteBeforeReplace: true } ); diff --git a/src/VNet/Firewall.ts b/src/VNet/Firewall.ts index 8484975b..9f706e36 100644 --- a/src/VNet/Firewall.ts +++ b/src/VNet/Firewall.ts @@ -1,7 +1,7 @@ import * as network from '@pulumi/azure-native/network'; import * as pulumi from '@pulumi/pulumi'; -import { defaultTags, isPrd } from '../Common/AzureEnv'; +import { isPrd } from '../Common/AzureEnv'; import { getFirewallName } from '../Common/Naming'; import ResourceCreator from '../Core/ResourceCreator'; import { @@ -121,7 +121,6 @@ export default ({ ], }, - tags: defaultTags, ...others, dependsOn, } as network.AzureFirewallArgs & DefaultResourceArgs); diff --git a/src/VNet/FirewallPolicy.ts b/src/VNet/FirewallPolicy.ts index da3dcffa..ee267f2c 100644 --- a/src/VNet/FirewallPolicy.ts +++ b/src/VNet/FirewallPolicy.ts @@ -2,7 +2,6 @@ import * as network from '@pulumi/azure-native/network'; import { input as inputs, enums } from '@pulumi/azure-native/types'; import { Input, Resource } from '@pulumi/pulumi'; import { BasicResourceArgs, DefaultResourceArgs } from '../types'; -import { defaultTags } from '../Common/AzureEnv'; import { getFirewallPolicyGroupName, getFirewallPolicyName, @@ -174,7 +173,6 @@ export default ({ }, } : undefined, - tags: defaultTags, }, { dependsOn } ); diff --git a/src/VNet/IpAddress.ts b/src/VNet/IpAddress.ts index 3d8c0980..05178369 100644 --- a/src/VNet/IpAddress.ts +++ b/src/VNet/IpAddress.ts @@ -1,9 +1,7 @@ import * as network from '@pulumi/azure-native/network'; - import { Input } from '@pulumi/pulumi'; - import { BasicResourceArgs } from '../types'; -import { defaultTags, isPrd } from '../Common/AzureEnv'; +import { isPrd } from '../Common/AzureEnv'; import { getIpAddressName } from '../Common/Naming'; import Locker from '../Core/Locker'; import { organization } from '../Common/StackEnv'; @@ -59,7 +57,6 @@ export default ({ : undefined, sku, zones: isPrd ? ['1', '2', '3'] : undefined, - tags: defaultTags, }, { dependsOn: publicIPPrefix } ); diff --git a/src/VNet/PrivateEndpoint.ts b/src/VNet/PrivateEndpoint.ts index d0c28347..0dfd0d7d 100644 --- a/src/VNet/PrivateEndpoint.ts +++ b/src/VNet/PrivateEndpoint.ts @@ -1,9 +1,6 @@ import * as network from "@pulumi/azure-native/network"; - import { Input, output } from "@pulumi/pulumi"; - import { BasicResourceArgs, PrivateLinkProps } from "../types"; -import { defaultTags } from "../Common/AzureEnv"; import { getVnetIdFromSubnetId } from "./Helper"; import PrivateZone, { linkVnetToPrivateDns, addARecord } from "./PrivateDns"; import { getResourceInfoFromId } from "../Common/AzureEnv"; @@ -35,7 +32,6 @@ export default ({ privateLinkServiceId: resourceId, }, ], - tags: defaultTags, }); //Get IpAddress in diff --git a/src/VNet/Vnet.ts b/src/VNet/Vnet.ts index 54524566..620c1dcb 100644 --- a/src/VNet/Vnet.ts +++ b/src/VNet/Vnet.ts @@ -3,7 +3,6 @@ import * as pulumi from '@pulumi/pulumi'; import { input as inputs } from '@pulumi/azure-native/types'; import { output as outputs } from '@pulumi/azure-native/types'; import { BasicResourceArgs } from '../types'; -import { defaultTags } from '../Common/AzureEnv'; import { appGatewaySubnetName, azBastionSubnetName, @@ -190,8 +189,6 @@ export default ({ enableDdosProtection: ddosId !== undefined, ddosProtectionPlan: ddosId ? { id: ddosId } : undefined, - - tags: defaultTags, }); const subnetResults: Record< diff --git a/src/Web/AppCertOrder.ts b/src/Web/AppCertOrder.ts index 9641f832..7a000aa6 100644 --- a/src/Web/AppCertOrder.ts +++ b/src/Web/AppCertOrder.ts @@ -1,9 +1,6 @@ import * as certificateregistration from "@pulumi/azure-native/certificateregistration"; - import { DefaultResourceArgs, KeyVaultInfo } from "../types"; - import creator from "../Core/ResourceCreator"; -import { defaultTags } from "../Common/AzureEnv"; import { global } from "../Common"; import { getCertOrderName } from "../Common/Naming"; @@ -33,7 +30,6 @@ export default ({ distinguishedName: `CN=*.${domain}`, keySize: 2048, validityInYears: 1, - tags: defaultTags, ...others, } as certificateregistration.AppServiceCertificateOrderArgs & DefaultResourceArgs diff --git a/src/Web/AppConfig.ts b/src/Web/AppConfig.ts index 0beb45f1..f9011136 100644 --- a/src/Web/AppConfig.ts +++ b/src/Web/AppConfig.ts @@ -1,5 +1,4 @@ import * as AppConfiguration from '@pulumi/azure-native/appconfiguration'; -import { defaultTags } from '../Common/AzureEnv'; import { getAppConfigName, getPrivateEndpointName } from '../Common/Naming'; import { KeyVaultInfo, PrivateLinkProps, ResourceGroupInfo } from '../types'; import { AppConfigDisableAccessKeysResource } from '@drunk-pulumi/azure-providers/AppConfigDisableAccessKeys'; @@ -41,7 +40,6 @@ export default ({ // ? AppConfiguration.PublicNetworkAccess.Enabled // : AppConfiguration.PublicNetworkAccess.Disabled, sku: { name: 'Standard' }, - tags: defaultTags, }); //Access Keys diff --git a/src/Web/FuncApp.ts b/src/Web/FuncApp.ts index 50d41950..6e8439bd 100644 --- a/src/Web/FuncApp.ts +++ b/src/Web/FuncApp.ts @@ -4,7 +4,6 @@ import { getFuncAppName } from '../Common/Naming'; import Locker from '../Core/Locker'; import * as pulumi from '@pulumi/pulumi'; import { SiteConfigArgs } from './types'; -import { defaultTags } from '../Common/AzureEnv'; interface Props extends BasicResourceArgs { kind: 'FunctionApp' | 'WebApp'; @@ -37,7 +36,6 @@ export default ({ httpsOnly: true, siteConfig, - tags: defaultTags, }, { deleteBeforeReplace: true } );