@drunk-pulumi/azure 1.0.81 → 1.0.83
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/Aks/index.js +1 -2
- package/AzAd/EnvRoles/EnvRoles.Consts.d.ts +1 -1
- package/AzAd/EnvRoles/EnvRoles.Consts.js +13 -3
- package/Builder/ApimBuilder.js +1 -1
- package/Builder/ApimPolicyBuilder.js +1 -1
- package/Builder/ApimProductBuilder.js +3 -3
- package/Builder/AppContainerBuilder.d.ts +19 -0
- package/Builder/AppContainerBuilder.js +379 -0
- package/Builder/AzSearchBuilder.js +2 -2
- package/Builder/VnetBuilder.js +7 -5
- package/Builder/index.d.ts +1 -0
- package/Builder/index.js +4 -2
- package/Builder/types/appContainerBuilder.d.ts +218 -0
- package/Builder/types/appContainerBuilder.js +3 -0
- package/Builder/types/index.d.ts +1 -0
- package/Builder/types/index.js +2 -1
- package/Builder/types/posgreSqlBuilder.d.ts +1 -1
- package/Common/Naming.d.ts +13 -1
- package/Common/Naming.js +13 -1
- package/Common/RsInfo/Helper.d.ts +1 -1
- package/VNet/Helper.d.ts +1 -1
- package/VNet/Helper.js +3 -3
- package/VNet/NSGRules/BlockInternetSecurityRule.js +1 -1
- package/VNet/Vnet.d.ts +1 -1
- package/VNet/Vnet.js +1 -1
- package/package.json +9 -9
- package/types.d.ts +2 -0
|
@@ -0,0 +1,218 @@
|
|
|
1
|
+
import { BuilderProps, IBuilder } from './genericBuilder';
|
|
2
|
+
import { ResourceInfo, WithEnvRoles, WithLogInfo, WithVaultInfo } from '../../types';
|
|
3
|
+
import { Input } from '@pulumi/pulumi';
|
|
4
|
+
export type AppContainerBuilderArgs = BuilderProps & WithEnvRoles & WithLogInfo & WithVaultInfo;
|
|
5
|
+
export type AppContainerEnvironmentType = {
|
|
6
|
+
/**
|
|
7
|
+
* Workload profile type to pin for container app execution.
|
|
8
|
+
*/
|
|
9
|
+
workloadProfileType?: 'Consumption' | 'D4' | 'D8' | 'D16' | 'D32' | 'E4' | 'E8' | 'E16' | 'E32' | string;
|
|
10
|
+
/**
|
|
11
|
+
* Logs destination configuration.
|
|
12
|
+
*/
|
|
13
|
+
logsDestination?: 'log-analytics' | 'azure-monitor';
|
|
14
|
+
/**
|
|
15
|
+
* VNet configuration for the environment.
|
|
16
|
+
*/
|
|
17
|
+
vnetConfiguration?: {
|
|
18
|
+
infrastructureSubnetId?: Input<string>;
|
|
19
|
+
internal?: boolean;
|
|
20
|
+
};
|
|
21
|
+
/**
|
|
22
|
+
* Whether to enable zone redundancy.
|
|
23
|
+
*/
|
|
24
|
+
zoneRedundant?: boolean;
|
|
25
|
+
};
|
|
26
|
+
export type AppContainerConfigType = {
|
|
27
|
+
/**
|
|
28
|
+
* Container image to use.
|
|
29
|
+
*/
|
|
30
|
+
image: Input<string>;
|
|
31
|
+
/**
|
|
32
|
+
* Container name.
|
|
33
|
+
*/
|
|
34
|
+
name?: string;
|
|
35
|
+
/**
|
|
36
|
+
* CPU and memory configuration.
|
|
37
|
+
*/
|
|
38
|
+
resources?: {
|
|
39
|
+
cpu?: number;
|
|
40
|
+
memory?: string;
|
|
41
|
+
};
|
|
42
|
+
/**
|
|
43
|
+
* Environment variables for the container.
|
|
44
|
+
*/
|
|
45
|
+
env?: Array<{
|
|
46
|
+
name: Input<string>;
|
|
47
|
+
value?: Input<string>;
|
|
48
|
+
secretRef?: Input<string>;
|
|
49
|
+
}>;
|
|
50
|
+
/**
|
|
51
|
+
* Command to run in the container.
|
|
52
|
+
*/
|
|
53
|
+
command?: Input<string>[];
|
|
54
|
+
/**
|
|
55
|
+
* Arguments to the command.
|
|
56
|
+
*/
|
|
57
|
+
args?: Input<string>[];
|
|
58
|
+
/**
|
|
59
|
+
* Probes for health checks.
|
|
60
|
+
*/
|
|
61
|
+
probes?: Array<{
|
|
62
|
+
type?: 'Liveness' | 'Readiness' | 'Startup';
|
|
63
|
+
httpGet?: {
|
|
64
|
+
path: Input<string>;
|
|
65
|
+
port: Input<number>;
|
|
66
|
+
scheme?: 'HTTP' | 'HTTPS';
|
|
67
|
+
};
|
|
68
|
+
initialDelaySeconds?: number;
|
|
69
|
+
periodSeconds?: number;
|
|
70
|
+
failureThreshold?: number;
|
|
71
|
+
}>;
|
|
72
|
+
};
|
|
73
|
+
export type AppContainerIngressType = {
|
|
74
|
+
/**
|
|
75
|
+
* Whether ingress is enabled.
|
|
76
|
+
*/
|
|
77
|
+
external?: boolean;
|
|
78
|
+
/**
|
|
79
|
+
* Target port for ingress.
|
|
80
|
+
*/
|
|
81
|
+
targetPort?: number;
|
|
82
|
+
/**
|
|
83
|
+
* Transport protocol (HTTP/HTTP2/TCP).
|
|
84
|
+
*/
|
|
85
|
+
transport?: 'auto' | 'http' | 'http2' | 'tcp';
|
|
86
|
+
/**
|
|
87
|
+
* Allow insecure connections.
|
|
88
|
+
*/
|
|
89
|
+
allowInsecure?: boolean;
|
|
90
|
+
/**
|
|
91
|
+
* Custom domains.
|
|
92
|
+
*/
|
|
93
|
+
customDomains?: Array<{
|
|
94
|
+
name: Input<string>;
|
|
95
|
+
certificateId?: Input<string>;
|
|
96
|
+
bindingType?: 'Disabled' | 'SniEnabled';
|
|
97
|
+
}>;
|
|
98
|
+
/**
|
|
99
|
+
* Traffic weights for revisions.
|
|
100
|
+
*/
|
|
101
|
+
traffic?: Array<{
|
|
102
|
+
revisionName?: Input<string>;
|
|
103
|
+
weight?: number;
|
|
104
|
+
latestRevision?: boolean;
|
|
105
|
+
label?: Input<string>;
|
|
106
|
+
}>;
|
|
107
|
+
};
|
|
108
|
+
export type AppContainerScaleType = {
|
|
109
|
+
/**
|
|
110
|
+
* Minimum number of replicas.
|
|
111
|
+
*/
|
|
112
|
+
minReplicas?: number;
|
|
113
|
+
/**
|
|
114
|
+
* Maximum number of replicas.
|
|
115
|
+
*/
|
|
116
|
+
maxReplicas?: number;
|
|
117
|
+
/**
|
|
118
|
+
* Scaling rules.
|
|
119
|
+
*/
|
|
120
|
+
rules?: Array<{
|
|
121
|
+
name: Input<string>;
|
|
122
|
+
custom?: {
|
|
123
|
+
type: Input<string>;
|
|
124
|
+
metadata?: Record<string, Input<string>>;
|
|
125
|
+
};
|
|
126
|
+
http?: {
|
|
127
|
+
metadata?: {
|
|
128
|
+
concurrentRequests?: Input<string>;
|
|
129
|
+
};
|
|
130
|
+
};
|
|
131
|
+
}>;
|
|
132
|
+
};
|
|
133
|
+
export type AppContainerSecretsType = {
|
|
134
|
+
name: Input<string>;
|
|
135
|
+
value?: Input<string>;
|
|
136
|
+
keyVaultUrl?: Input<string>;
|
|
137
|
+
identity?: Input<string>;
|
|
138
|
+
};
|
|
139
|
+
export type AppContainerRegistryType = {
|
|
140
|
+
server: Input<string>;
|
|
141
|
+
username?: Input<string>;
|
|
142
|
+
passwordSecretRef?: Input<string>;
|
|
143
|
+
identity?: Input<string>;
|
|
144
|
+
};
|
|
145
|
+
export type AppContainerDaprType = {
|
|
146
|
+
/**
|
|
147
|
+
* Dapr application ID.
|
|
148
|
+
*/
|
|
149
|
+
appId?: Input<string>;
|
|
150
|
+
/**
|
|
151
|
+
* Dapr application port.
|
|
152
|
+
*/
|
|
153
|
+
appPort?: number;
|
|
154
|
+
/**
|
|
155
|
+
* Dapr application protocol.
|
|
156
|
+
*/
|
|
157
|
+
appProtocol?: 'http' | 'grpc';
|
|
158
|
+
/**
|
|
159
|
+
* Enable Dapr.
|
|
160
|
+
*/
|
|
161
|
+
enabled?: boolean;
|
|
162
|
+
/**
|
|
163
|
+
* HTTP max request size in MB.
|
|
164
|
+
*/
|
|
165
|
+
httpMaxRequestSize?: number;
|
|
166
|
+
/**
|
|
167
|
+
* HTTP read buffer size in KB.
|
|
168
|
+
*/
|
|
169
|
+
httpReadBufferSize?: number;
|
|
170
|
+
/**
|
|
171
|
+
* Enable API logging.
|
|
172
|
+
*/
|
|
173
|
+
enableApiLogging?: boolean;
|
|
174
|
+
/**
|
|
175
|
+
* Log level.
|
|
176
|
+
*/
|
|
177
|
+
logLevel?: 'info' | 'debug' | 'warn' | 'error';
|
|
178
|
+
};
|
|
179
|
+
export interface IAppContainerEnvironmentBuilder {
|
|
180
|
+
/**
|
|
181
|
+
* Configure the Container Apps environment.
|
|
182
|
+
*/
|
|
183
|
+
withEnvironment(props?: AppContainerEnvironmentType): IAppContainerBuilder;
|
|
184
|
+
}
|
|
185
|
+
export interface IAppContainerBuilder extends IBuilder<ResourceInfo> {
|
|
186
|
+
/**
|
|
187
|
+
* Add a container configuration.
|
|
188
|
+
*/
|
|
189
|
+
withContainer(props: AppContainerConfigType): IAppContainerBuilder;
|
|
190
|
+
/**
|
|
191
|
+
* Configure ingress settings.
|
|
192
|
+
*/
|
|
193
|
+
withIngress(props: AppContainerIngressType): IAppContainerBuilder;
|
|
194
|
+
/**
|
|
195
|
+
* Configure scaling settings.
|
|
196
|
+
*/
|
|
197
|
+
withScale(props: AppContainerScaleType): IAppContainerBuilder;
|
|
198
|
+
/**
|
|
199
|
+
* Add secrets to the container app.
|
|
200
|
+
*/
|
|
201
|
+
withSecrets(secrets: AppContainerSecretsType[]): IAppContainerBuilder;
|
|
202
|
+
/**
|
|
203
|
+
* Configure container registry.
|
|
204
|
+
*/
|
|
205
|
+
withRegistry(registry: AppContainerRegistryType): IAppContainerBuilder;
|
|
206
|
+
/**
|
|
207
|
+
* Configure Dapr.
|
|
208
|
+
*/
|
|
209
|
+
withDapr(props: AppContainerDaprType): IAppContainerBuilder;
|
|
210
|
+
/**
|
|
211
|
+
* Configure managed identity.
|
|
212
|
+
*/
|
|
213
|
+
withIdentity(type: 'SystemAssigned' | 'UserAssigned' | 'SystemAssigned,UserAssigned'): IAppContainerBuilder;
|
|
214
|
+
/**
|
|
215
|
+
* Lock the container app to prevent deletion.
|
|
216
|
+
*/
|
|
217
|
+
lock(): IAppContainerBuilder;
|
|
218
|
+
}
|
|
@@ -0,0 +1,3 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYXBwQ29udGFpbmVyQnVpbGRlci5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uL3NyYy9CdWlsZGVyL3R5cGVzL2FwcENvbnRhaW5lckJ1aWxkZXIudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IiJ9
|
package/Builder/types/index.d.ts
CHANGED
|
@@ -5,6 +5,7 @@ export * from './apimPolicyBuilder';
|
|
|
5
5
|
export * from './apimProductBuilder';
|
|
6
6
|
export * from './appCertBuilder';
|
|
7
7
|
export * from './appConfigBuilder';
|
|
8
|
+
export * from './appContainerBuilder';
|
|
8
9
|
export * from './askBuilder';
|
|
9
10
|
export * from './automationBuilder';
|
|
10
11
|
export * from './azAppBuilder';
|
package/Builder/types/index.js
CHANGED
|
@@ -21,6 +21,7 @@ __exportStar(require("./apimPolicyBuilder"), exports);
|
|
|
21
21
|
__exportStar(require("./apimProductBuilder"), exports);
|
|
22
22
|
__exportStar(require("./appCertBuilder"), exports);
|
|
23
23
|
__exportStar(require("./appConfigBuilder"), exports);
|
|
24
|
+
__exportStar(require("./appContainerBuilder"), exports);
|
|
24
25
|
__exportStar(require("./askBuilder"), exports);
|
|
25
26
|
__exportStar(require("./automationBuilder"), exports);
|
|
26
27
|
__exportStar(require("./azAppBuilder"), exports);
|
|
@@ -43,4 +44,4 @@ __exportStar(require("./storageBuilder"), exports);
|
|
|
43
44
|
__exportStar(require("./vdiBuilder"), exports);
|
|
44
45
|
__exportStar(require("./vmBuilder"), exports);
|
|
45
46
|
__exportStar(require("./vnetBuilder"), exports);
|
|
46
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
47
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi9zcmMvQnVpbGRlci90eXBlcy9pbmRleC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7Ozs7Ozs7Ozs7Ozs7O0FBQUEsK0NBQTZCO0FBQzdCLCtDQUE2QjtBQUM3QixnREFBOEI7QUFDOUIsc0RBQW9DO0FBQ3BDLHVEQUFxQztBQUNyQyxtREFBaUM7QUFDakMscURBQW1DO0FBQ25DLHdEQUFzQztBQUN0QywrQ0FBNkI7QUFDN0Isc0RBQW9DO0FBQ3BDLGlEQUErQjtBQUMvQixvREFBa0M7QUFDbEMsK0NBQTZCO0FBQzdCLG1EQUFpQztBQUNqQyxtREFBaUM7QUFDakMsbURBQWlDO0FBQ2pDLGtEQUFnQztBQUNoQyxvREFBa0M7QUFDbEMsaURBQStCO0FBQy9CLHFEQUFtQztBQUNuQywwREFBd0M7QUFDeEMsc0RBQW9DO0FBQ3BDLG9EQUFrQztBQUNsQyxzREFBb0M7QUFDcEMsbURBQWlDO0FBQ2pDLCtDQUE2QjtBQUM3QixtREFBaUM7QUFDakMsK0NBQTZCO0FBQzdCLDhDQUE0QjtBQUM1QixnREFBOEIifQ==
|
|
@@ -26,7 +26,7 @@ type PostgreSkuArgs = {
|
|
|
26
26
|
*/
|
|
27
27
|
export type PostgreSqlSkuBuilderType = {
|
|
28
28
|
sku: PostgreSkuArgs;
|
|
29
|
-
version: postgresql.
|
|
29
|
+
version: postgresql.PostgresMajorVersion;
|
|
30
30
|
};
|
|
31
31
|
/**
|
|
32
32
|
* Type for defining network properties for a PostgreSQL server.
|
package/Common/Naming.d.ts
CHANGED
|
@@ -26,6 +26,18 @@ export declare const rules: {
|
|
|
26
26
|
suffix: string;
|
|
27
27
|
maxLength: number;
|
|
28
28
|
};
|
|
29
|
+
getContainerAppName: {
|
|
30
|
+
cleanName: boolean;
|
|
31
|
+
includeOrgName: boolean;
|
|
32
|
+
suffix: string;
|
|
33
|
+
maxLength: number;
|
|
34
|
+
};
|
|
35
|
+
getContainerAppEnvName: {
|
|
36
|
+
cleanName: boolean;
|
|
37
|
+
includeOrgName: boolean;
|
|
38
|
+
suffix: string;
|
|
39
|
+
maxLength: number;
|
|
40
|
+
};
|
|
29
41
|
getAutomationAccountName: {
|
|
30
42
|
cleanName: boolean;
|
|
31
43
|
maxLength: number;
|
|
@@ -303,5 +315,5 @@ export declare const removeLeadingAndTrailingDash: (s: string) => string;
|
|
|
303
315
|
export declare const cleanName: (name: string) => string;
|
|
304
316
|
export declare const getResourceName: (name: string, convention?: ConventionProps) => string;
|
|
305
317
|
export declare function namingCreator(): Record<keyof RulerTypes, NamingFunc>;
|
|
306
|
-
declare const _default: Record<"getResourceGroupName" | "getStorageName" | "getSearchServiceName" | "getAppPlanName" | "getAutomationAccountName" | "getB2cName" | "getCosmosDbName" | "getAppConfigName" | "getApimName" | "getDiskEncryptionName" | "getSshName" | "getIdentityName" | "getUIDName" | "getAksName" | "getK8sProviderName" | "getAppInsightName" | "getLogWpName" | "getWebAppName" | "getFuncAppName" | "getWebTestName" | "getAlertName" | "getRedisCacheName" | "getServiceBusName" | "getPrivateEndpointName" | "getSignalRName" | "getElasticPoolName" | "getSqlDbName" | "getSqlServerName" | "getPostgresqlName" | "getMySqlName" | "getFirewallName" | "getFirewallPolicyName" | "getFirewallPolicyGroupName" | "getVMName" | "getNICName" | "getVdiName" | "getVpnName" | "getVnetName" | "getWanName" | "getHubName" | "getIotHubName" | "getRouteName" | "getWorkflowName" | "getNetworkSGName" | "getIpAddressName" | "getIpAddressPrefixName" | "getAppGatewayName" | "getNatGatewayName" | "getBastionName" | "getKeyVaultName" | "getCdnEndpointName" | "getCdnProfileName" | "getAcrName" | "getCertOrderName", NamingFunc>;
|
|
318
|
+
declare const _default: Record<"getResourceGroupName" | "getStorageName" | "getSearchServiceName" | "getAppPlanName" | "getContainerAppName" | "getContainerAppEnvName" | "getAutomationAccountName" | "getB2cName" | "getCosmosDbName" | "getAppConfigName" | "getApimName" | "getDiskEncryptionName" | "getSshName" | "getIdentityName" | "getUIDName" | "getAksName" | "getK8sProviderName" | "getAppInsightName" | "getLogWpName" | "getWebAppName" | "getFuncAppName" | "getWebTestName" | "getAlertName" | "getRedisCacheName" | "getServiceBusName" | "getPrivateEndpointName" | "getSignalRName" | "getElasticPoolName" | "getSqlDbName" | "getSqlServerName" | "getPostgresqlName" | "getMySqlName" | "getFirewallName" | "getFirewallPolicyName" | "getFirewallPolicyGroupName" | "getVMName" | "getNICName" | "getVdiName" | "getVpnName" | "getVnetName" | "getWanName" | "getHubName" | "getIotHubName" | "getRouteName" | "getWorkflowName" | "getNetworkSGName" | "getIpAddressName" | "getIpAddressPrefixName" | "getAppGatewayName" | "getNatGatewayName" | "getBastionName" | "getKeyVaultName" | "getCdnEndpointName" | "getCdnProfileName" | "getAcrName" | "getCertOrderName", NamingFunc>;
|
|
307
319
|
export default _default;
|
package/Common/Naming.js
CHANGED
|
@@ -33,6 +33,18 @@ exports.rules = {
|
|
|
33
33
|
suffix: 'app-plan',
|
|
34
34
|
maxLength: 80,
|
|
35
35
|
},
|
|
36
|
+
getContainerAppName: {
|
|
37
|
+
cleanName: true,
|
|
38
|
+
includeOrgName: true,
|
|
39
|
+
suffix: 'capp',
|
|
40
|
+
maxLength: 32,
|
|
41
|
+
},
|
|
42
|
+
getContainerAppEnvName: {
|
|
43
|
+
cleanName: true,
|
|
44
|
+
includeOrgName: true,
|
|
45
|
+
suffix: 'capp-env',
|
|
46
|
+
maxLength: 60,
|
|
47
|
+
},
|
|
36
48
|
getAutomationAccountName: {
|
|
37
49
|
cleanName: true,
|
|
38
50
|
maxLength: 80,
|
|
@@ -385,4 +397,4 @@ function namingCreator() {
|
|
|
385
397
|
return namingResult;
|
|
386
398
|
}
|
|
387
399
|
exports.default = namingCreator();
|
|
388
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"Naming.js","sourceRoot":"","sources":["../../src/Common/Naming.ts"],"names":[],"mappings":"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"}
|
|
400
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"Naming.js","sourceRoot":"","sources":["../../src/Common/Naming.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
1
|
import { ResourceInfo, NamingType } from '../../types';
|
|
2
2
|
type ResourceNamingFunc = (groupName: NamingType, resourceName?: NamingType) => Omit<ResourceInfo, 'id'>;
|
|
3
|
-
declare const _default: Record<"getStorageName" | "getSearchServiceName" | "getAppPlanName" | "getAutomationAccountName" | "getB2cName" | "getCosmosDbName" | "getAppConfigName" | "getApimName" | "getDiskEncryptionName" | "getSshName" | "getIdentityName" | "getUIDName" | "getAksName" | "getK8sProviderName" | "getAppInsightName" | "getLogWpName" | "getWebAppName" | "getFuncAppName" | "getWebTestName" | "getAlertName" | "getRedisCacheName" | "getServiceBusName" | "getPrivateEndpointName" | "getSignalRName" | "getElasticPoolName" | "getSqlDbName" | "getSqlServerName" | "getPostgresqlName" | "getMySqlName" | "getFirewallName" | "getFirewallPolicyName" | "getFirewallPolicyGroupName" | "getVMName" | "getNICName" | "getVdiName" | "getVpnName" | "getVnetName" | "getWanName" | "getHubName" | "getIotHubName" | "getRouteName" | "getWorkflowName" | "getNetworkSGName" | "getIpAddressName" | "getIpAddressPrefixName" | "getAppGatewayName" | "getNatGatewayName" | "getBastionName" | "getKeyVaultName" | "getCdnEndpointName" | "getCdnProfileName" | "getAcrName" | "getCertOrderName", ResourceNamingFunc>;
|
|
3
|
+
declare const _default: Record<"getStorageName" | "getSearchServiceName" | "getAppPlanName" | "getContainerAppName" | "getContainerAppEnvName" | "getAutomationAccountName" | "getB2cName" | "getCosmosDbName" | "getAppConfigName" | "getApimName" | "getDiskEncryptionName" | "getSshName" | "getIdentityName" | "getUIDName" | "getAksName" | "getK8sProviderName" | "getAppInsightName" | "getLogWpName" | "getWebAppName" | "getFuncAppName" | "getWebTestName" | "getAlertName" | "getRedisCacheName" | "getServiceBusName" | "getPrivateEndpointName" | "getSignalRName" | "getElasticPoolName" | "getSqlDbName" | "getSqlServerName" | "getPostgresqlName" | "getMySqlName" | "getFirewallName" | "getFirewallPolicyName" | "getFirewallPolicyGroupName" | "getVMName" | "getNICName" | "getVdiName" | "getVpnName" | "getVnetName" | "getWanName" | "getHubName" | "getIotHubName" | "getRouteName" | "getWorkflowName" | "getNetworkSGName" | "getIpAddressName" | "getIpAddressPrefixName" | "getAppGatewayName" | "getNatGatewayName" | "getBastionName" | "getKeyVaultName" | "getCdnEndpointName" | "getCdnProfileName" | "getAcrName" | "getCertOrderName", ResourceNamingFunc>;
|
|
4
4
|
export default _default;
|
package/VNet/Helper.d.ts
CHANGED
|
@@ -10,4 +10,4 @@ export declare const convertToIpRange: (ipAddress: string[]) => Array<{
|
|
|
10
10
|
start: string;
|
|
11
11
|
end: string;
|
|
12
12
|
}>;
|
|
13
|
-
export declare const getIpAddressFromHost: (host: string) => import("@pulumi/pulumi").Output<import("@pulumi/pulumi").UnwrappedObject<import("dns").LookupAddress>>;
|
|
13
|
+
export declare const getIpAddressFromHost: (host: string) => import("@pulumi/pulumi").Output<import("@pulumi/pulumi").UnwrappedObject<import("node:dns").LookupAddress>>;
|
package/VNet/Helper.js
CHANGED
|
@@ -48,14 +48,14 @@ exports.azBastionSubnetName = 'AzureBastionSubnet';
|
|
|
48
48
|
const getIpsRange = (prefix) => new netmask.Netmask(prefix);
|
|
49
49
|
exports.getIpsRange = getIpsRange;
|
|
50
50
|
/** Convert IP address and IP address group into range */
|
|
51
|
-
const convertToIpRange = (ipAddress) => ipAddress.
|
|
51
|
+
const convertToIpRange = (ipAddress) => ipAddress.flatMap((ip) => {
|
|
52
52
|
if (ip.includes('/')) {
|
|
53
53
|
const range = (0, exports.getIpsRange)(ip);
|
|
54
54
|
return { start: range.base, end: range.broadcast };
|
|
55
55
|
}
|
|
56
|
-
return { start: ip, end: ip };
|
|
56
|
+
return [{ start: ip, end: ip }];
|
|
57
57
|
});
|
|
58
58
|
exports.convertToIpRange = convertToIpRange;
|
|
59
59
|
const getIpAddressFromHost = (host) => (0, pulumi_1.output)(promises_1.default.lookup(host, { family: 4 }));
|
|
60
60
|
exports.getIpAddressFromHost = getIpAddressFromHost;
|
|
61
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
61
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiSGVscGVyLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL1ZOZXQvSGVscGVyLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7OztBQUFBLDJDQUF3QztBQUN4QyxpREFBbUM7QUFDbkMsaUVBQW9DO0FBRXZCLFFBQUEsb0JBQW9CLEdBQUcsYUFBYSxDQUFDO0FBQ3JDLFFBQUEsaUJBQWlCLEdBQUcsZUFBZSxDQUFDO0FBQ3BDLFFBQUEsZ0JBQWdCLEdBQUcscUJBQXFCLENBQUM7QUFDekMsUUFBQSwwQkFBMEIsR0FBRywrQkFBK0IsQ0FBQztBQUM3RCxRQUFBLG1CQUFtQixHQUFHLG9CQUFvQixDQUFDO0FBRWpELE1BQU0sV0FBVyxHQUFHLENBQUMsTUFBYyxFQUFFLEVBQUUsQ0FBQyxJQUFJLE9BQU8sQ0FBQyxPQUFPLENBQUMsTUFBTSxDQUFDLENBQUM7QUFBOUQsUUFBQSxXQUFXLGVBQW1EO0FBRTNFLHlEQUF5RDtBQUNsRCxNQUFNLGdCQUFnQixHQUFHLENBQzlCLFNBQW1CLEVBQ29CLEVBQUUsQ0FDekMsU0FBUyxDQUFDLE9BQU8sQ0FBQyxDQUFDLEVBQUUsRUFBRSxFQUFFO0lBQ3ZCLElBQUksRUFBRSxDQUFDLFFBQVEsQ0FBQyxHQUFHLENBQUMsRUFBRSxDQUFDO1FBQ3JCLE1BQU0sS0FBSyxHQUFHLElBQUEsbUJBQVcsRUFBQyxFQUFFLENBQUMsQ0FBQztRQUM5QixPQUFPLEVBQUUsS0FBSyxFQUFFLEtBQUssQ0FBQyxJQUFLLEVBQUUsR0FBRyxFQUFFLEtBQUssQ0FBQyxTQUFVLEVBQUUsQ0FBQztJQUN2RCxDQUFDO0lBQ0QsT0FBTyxDQUFDLEVBQUUsS0FBSyxFQUFFLEVBQUUsRUFBRSxHQUFHLEVBQUUsRUFBRSxFQUFFLENBQUMsQ0FBQztBQUNsQyxDQUFDLENBQUMsQ0FBQztBQVRRLFFBQUEsZ0JBQWdCLG9CQVN4QjtBQVFFLE1BQU0sb0JBQW9CLEdBQUcsQ0FBQyxJQUFZLEVBQUUsRUFBRSxDQUNuRCxJQUFBLGVBQU0sRUFBQyxrQkFBRyxDQUFDLE1BQU0sQ0FBQyxJQUFJLEVBQUUsRUFBRSxNQUFNLEVBQUUsQ0FBQyxFQUFFLENBQUMsQ0FBQyxDQUFDO0FBRDdCLFFBQUEsb0JBQW9CLHdCQUNTIn0=
|
package/VNet/Vnet.d.ts
CHANGED
|
@@ -4,7 +4,7 @@ import { output as outputs } from '@pulumi/azure-native/types';
|
|
|
4
4
|
import { BasicResourceArgs, ResourceInfo } from '../types';
|
|
5
5
|
import { CustomSecurityRuleArgs, RouteArgs } from './types';
|
|
6
6
|
import { SubnetProps } from './Subnet';
|
|
7
|
-
export type DelegateServices = 'Microsoft.ContainerInstance/containerGroups' | 'Microsoft.Web/serverFarms';
|
|
7
|
+
export type DelegateServices = 'Microsoft.ContainerInstance/containerGroups' | 'Microsoft.Web/serverFarms' | 'Microsoft.App/environments' | string;
|
|
8
8
|
export interface VnetProps extends BasicResourceArgs {
|
|
9
9
|
ddosId?: pulumi.Input<string>;
|
|
10
10
|
/** the prefix space of vnet: ex [192.168.0.0/16]. If not provided it will collect from subnet */
|
package/VNet/Vnet.js
CHANGED
|
@@ -173,4 +173,4 @@ exports.default = ({ name, group, ddosId, addressSpaces, subnets = [], natGatewa
|
|
|
173
173
|
bastionSubnet: findSubnet(Helper_1.azBastionSubnetName),
|
|
174
174
|
};
|
|
175
175
|
};
|
|
176
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
176
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiVm5ldC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9WTmV0L1ZuZXQudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7QUFBQSxzRUFBd0Q7QUFLeEQscUNBTWtCO0FBQ2xCLHNDQUFtQztBQUNuQyxzREFBcUQ7QUFDckQsb0VBQTRDO0FBQzVDLDhEQUFzQztBQUN0QywrRkFBdUU7QUEwRXZFLGtCQUFlLENBQUMsRUFDZCxJQUFJLEVBQ0osS0FBSyxFQUNMLE1BQU0sRUFDTixhQUFhLEVBQ2IsT0FBTyxHQUFHLEVBQUUsRUFDWixVQUFVLEVBQ1YsVUFBVSxFQUNWLFFBQVEsR0FBRyxFQUFFLEVBQ2IsU0FBUyxHQUNDLEVBQWMsRUFBRTtJQUMxQixNQUFNLEtBQUssR0FBRyxlQUFNLENBQUMsV0FBVyxDQUFDLElBQUksQ0FBQyxDQUFDO0lBQ3ZDLE1BQU0sYUFBYSxHQUFHLFFBQVEsQ0FBQyxhQUFhLEVBQUUsS0FBSyxJQUFJLEVBQUUsQ0FBQztJQUUxRCxZQUFZO0lBQ1osSUFBSSxRQUFRLENBQUMsZ0JBQWdCLEVBQUUsQ0FBQztRQUM5QixPQUFPLENBQUMsSUFBSSxDQUFDO1lBQ1gsSUFBSSxFQUFFLDZCQUFvQjtZQUMxQixhQUFhLEVBQUUsUUFBUSxDQUFDLGdCQUFnQixDQUFDLGFBQWE7WUFDdEQsdUJBQXVCLEVBQUUsS0FBSztZQUM5QixtQkFBbUIsRUFBRSxLQUFLO1lBQzFCLGdCQUFnQixFQUFFLEtBQUs7U0FDeEIsQ0FBQyxDQUFDO1FBRUgsNEVBQTRFO1FBQzVFLGFBQWEsQ0FBQyxJQUFJLENBQUMsR0FBRyxJQUFBLGdDQUFzQixFQUFDLFFBQVEsQ0FBQyxnQkFBZ0IsQ0FBQyxDQUFDLENBQUM7SUFDM0UsQ0FBQztJQUVELGdCQUFnQjtJQUNoQixJQUFJLFFBQVEsRUFBRSxhQUFhLEVBQUUsQ0FBQztRQUM1QixPQUFPLENBQUMsSUFBSSxDQUFDO1lBQ1gs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
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@drunk-pulumi/azure",
|
|
3
|
-
"version": "1.0.
|
|
3
|
+
"version": "1.0.83",
|
|
4
4
|
"author": "drunkcoding@outlook.com",
|
|
5
5
|
"description": "The custom helpers pulumi-azure",
|
|
6
6
|
"license": "MIT",
|
|
@@ -20,15 +20,15 @@
|
|
|
20
20
|
"@azure/keyvault-certificates": "^4.10.0",
|
|
21
21
|
"@azure/keyvault-secrets": "^4.10.0",
|
|
22
22
|
"@drunk-pulumi/azure-providers": "^1.0.10",
|
|
23
|
-
"@pulumi/azure-native": "^3.
|
|
24
|
-
"@pulumi/azuread": "6.
|
|
25
|
-
"@pulumi/pulumi": "^3.
|
|
26
|
-
"@pulumi/random": "^4.
|
|
27
|
-
"@pulumi/tls": "^5.2.
|
|
23
|
+
"@pulumi/azure-native": "^3.13.0",
|
|
24
|
+
"@pulumi/azuread": "6.8.0",
|
|
25
|
+
"@pulumi/pulumi": "^3.217.1",
|
|
26
|
+
"@pulumi/random": "^4.19.1",
|
|
27
|
+
"@pulumi/tls": "^5.2.3",
|
|
28
28
|
"netmask": "^2.0.2",
|
|
29
|
-
"node-forge": "^1.3.
|
|
30
|
-
"to-words": "^4.
|
|
31
|
-
"lodash": "^4.17.
|
|
29
|
+
"node-forge": "^1.3.3",
|
|
30
|
+
"to-words": "^4.10.0",
|
|
31
|
+
"lodash": "^4.17.23"
|
|
32
32
|
},
|
|
33
33
|
"prettier": {
|
|
34
34
|
"singleQuote": true
|
package/types.d.ts
CHANGED
|
@@ -346,6 +346,8 @@ export type RoleEnableTypes = {
|
|
|
346
346
|
enableServiceBus?: RoleEnableItem;
|
|
347
347
|
enableSignalR?: RoleEnableItem;
|
|
348
348
|
enableRedisCache?: RoleEnableItem;
|
|
349
|
+
/** Container App Roles */
|
|
350
|
+
enableContainerAppRoles?: RoleEnableItem;
|
|
349
351
|
};
|
|
350
352
|
export type ListRoleType = Record<EnvRoleKeyTypes, Set<string>>;
|
|
351
353
|
/**
|