Skip to content

Commit 880bd9e

Browse files
committed
update and fix bugs
1 parent 749b5de commit 880bd9e

File tree

5 files changed

+17
-8
lines changed

5 files changed

+17
-8
lines changed

Common/AutoTags.ts

+14
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,21 @@
11
import { runtime } from '@pulumi/pulumi';
22

3+
const ignoredTags = [
4+
'group:Group',
5+
'application:Application',
6+
'applicationPassword:ApplicationPassword',
7+
'servicePrincipal:ServicePrincipal',
8+
'servicePrincipalPassword:ServicePrincipalPassword',
9+
'kubernetes',
10+
];
11+
312
export function registerAutoTags(autoTags: Record<string, string>): void {
413
runtime.registerStackTransformation((args) => {
14+
//Check and ignore tag
15+
if (ignoredTags.find((t) => args.type.includes(t)))
16+
return { props: args.props, opts: args.opts };
17+
18+
//Apply default tag
519
args.props['tags'] = { ...args.props['tags'], ...autoTags };
620
return { props: args.props, opts: args.opts };
721
});

CustomProviders/VaultSecret.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import * as pulumi from '@pulumi/pulumi';
2-
import { KeyVaultInfo } from 'drunk-pulumi/types';
2+
import { KeyVaultInfo } from '../types';
33
import { getKeyVaultBase } from '../AzBase/KeyVaultBase';
44
import {
55
BaseOptions,

Storage/CdnHttpsEnable.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import {
99
BaseProvider,
1010
} from '../CustomProviders/Base';
1111
import { DefaultAzureCredential } from '@azure/identity';
12-
import { subscriptionId } from 'drunk-pulumi/Common/AzureEnv';
12+
import { subscriptionId } from '../Common/AzureEnv';
1313

1414
interface CdnManagedHttpsParameters {
1515
certificateSource: 'Cdn';

Tools/Axios.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
import axios from 'axios';
44
import { urlJoin } from 'url-join-ts';
55
import { DefaultAzureCredential } from '@azure/identity';
6-
import { subscriptionId } from 'drunk-pulumi/Common/AzureEnv';
6+
import { subscriptionId } from '../Common/AzureEnv';
77

88
export const createAxios = () => {
99
const credentials = new DefaultAzureCredential();

tsconfig.json

-5
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,6 @@
1313
"forceConsistentCasingInFileNames": true,
1414
"noImplicitAny": true,
1515
"strict": true,
16-
"paths": {
17-
"drunk-pulumi/*": [
18-
"./*"
19-
]
20-
}
2116
},
2217
"files": [
2318
"Aks/Helper.ts",

0 commit comments

Comments
 (0)