@reyemtech/nimbus 1.1.1 → 1.1.2
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/dist/cjs/cli/templates.js +12 -12
- package/dist/cjs/cli.js +2 -4
- package/dist/cjs/cli.js.map +1 -1
- package/dist/cjs/factories/cluster.d.ts +3 -3
- package/dist/cjs/factories/cluster.d.ts.map +1 -1
- package/dist/cjs/factories/cluster.js +10 -43
- package/dist/cjs/factories/cluster.js.map +1 -1
- package/dist/cjs/factories/dns.d.ts +2 -2
- package/dist/cjs/factories/dns.d.ts.map +1 -1
- package/dist/cjs/factories/dns.js +8 -41
- package/dist/cjs/factories/dns.js.map +1 -1
- package/dist/cjs/factories/network.d.ts +3 -3
- package/dist/cjs/factories/network.d.ts.map +1 -1
- package/dist/cjs/factories/network.js +10 -43
- package/dist/cjs/factories/network.js.map +1 -1
- package/dist/cjs/factories/secrets.d.ts +3 -3
- package/dist/cjs/factories/secrets.d.ts.map +1 -1
- package/dist/cjs/factories/secrets.js +9 -42
- package/dist/cjs/factories/secrets.js.map +1 -1
- package/dist/cjs/factories/state.d.ts +2 -2
- package/dist/cjs/factories/state.d.ts.map +1 -1
- package/dist/cjs/factories/state.js +8 -41
- package/dist/cjs/factories/state.js.map +1 -1
- package/dist/cjs/platform/stack.d.ts +4 -0
- package/dist/cjs/platform/stack.d.ts.map +1 -1
- package/dist/cjs/platform/stack.js +4 -0
- package/dist/cjs/platform/stack.js.map +1 -1
- package/dist/esm/cli/templates.js +12 -12
- package/dist/esm/cli.js +2 -4
- package/dist/esm/cli.js.map +1 -1
- package/dist/esm/factories/cluster.d.ts +3 -3
- package/dist/esm/factories/cluster.d.ts.map +1 -1
- package/dist/esm/factories/cluster.js +10 -10
- package/dist/esm/factories/cluster.js.map +1 -1
- package/dist/esm/factories/dns.d.ts +2 -2
- package/dist/esm/factories/dns.d.ts.map +1 -1
- package/dist/esm/factories/dns.js +8 -8
- package/dist/esm/factories/dns.js.map +1 -1
- package/dist/esm/factories/network.d.ts +3 -3
- package/dist/esm/factories/network.d.ts.map +1 -1
- package/dist/esm/factories/network.js +10 -10
- package/dist/esm/factories/network.js.map +1 -1
- package/dist/esm/factories/secrets.d.ts +3 -3
- package/dist/esm/factories/secrets.d.ts.map +1 -1
- package/dist/esm/factories/secrets.js +9 -9
- package/dist/esm/factories/secrets.js.map +1 -1
- package/dist/esm/factories/state.d.ts +2 -2
- package/dist/esm/factories/state.d.ts.map +1 -1
- package/dist/esm/factories/state.js +8 -8
- package/dist/esm/factories/state.js.map +1 -1
- package/dist/esm/platform/stack.d.ts +4 -0
- package/dist/esm/platform/stack.d.ts.map +1 -1
- package/dist/esm/platform/stack.js +4 -0
- package/dist/esm/platform/stack.js.map +1 -1
- package/package.json +1 -12
|
@@ -141,14 +141,14 @@ function emptyTemplate(name) {
|
|
|
141
141
|
// createPlatformStack,
|
|
142
142
|
// } from "@reyemtech/nimbus";
|
|
143
143
|
// import type { INetwork, ICluster, IDns, ISecrets, IStateBackend } from "@reyemtech/nimbus";
|
|
144
|
-
|
|
145
|
-
// TODO: Define your cloud target
|
|
144
|
+
//
|
|
145
|
+
// // TODO: Define your cloud target
|
|
146
146
|
// const cloud = "aws";
|
|
147
|
-
|
|
148
|
-
// TODO: Create resources
|
|
149
|
-
// const network = createNetwork("${name}", { cloud, cidr: "10.0.0.0/16" });
|
|
150
|
-
|
|
151
|
-
//
|
|
147
|
+
//
|
|
148
|
+
// // TODO: Create resources
|
|
149
|
+
// const network = createNetwork("${name}", { cloud, cidr: "10.0.0.0/16" }) as INetwork;
|
|
150
|
+
//
|
|
151
|
+
// // Stack outputs
|
|
152
152
|
// export const output = "replace-me";
|
|
153
153
|
`;
|
|
154
154
|
const readmeMd = `# ${name}
|
|
@@ -207,7 +207,7 @@ secrets.putSecret("database", {
|
|
|
207
207
|
password: "change-me-in-pulumi-config",
|
|
208
208
|
});
|
|
209
209
|
|
|
210
|
-
//
|
|
210
|
+
// Stack outputs
|
|
211
211
|
export const backendUrl = backend.backendUrl;
|
|
212
212
|
export const bucketName = backend.bucketName;
|
|
213
213
|
`;
|
|
@@ -284,7 +284,7 @@ secrets.putSecret("database", {
|
|
|
284
284
|
password: "change-me-in-pulumi-config",
|
|
285
285
|
});
|
|
286
286
|
|
|
287
|
-
//
|
|
287
|
+
// Stack outputs
|
|
288
288
|
export const backendUrl = backend.backendUrl;
|
|
289
289
|
export const storageAccountName = backend.storageAccountName;
|
|
290
290
|
`;
|
|
@@ -405,7 +405,7 @@ const platform = createPlatformStack("${name}", {
|
|
|
405
405
|
vault: { enabled: true, ingressHost: "vault.example.com" },
|
|
406
406
|
});
|
|
407
407
|
|
|
408
|
-
//
|
|
408
|
+
// Stack outputs
|
|
409
409
|
export const vpcId = network.vpcId;
|
|
410
410
|
export const clusterEndpoint = cluster.endpoint;
|
|
411
411
|
export const zoneId = dns.zoneId;
|
|
@@ -569,7 +569,7 @@ const platform = createPlatformStack("${name}", {
|
|
|
569
569
|
vault: { enabled: true, ingressHost: "vault.example.com" },
|
|
570
570
|
});
|
|
571
571
|
|
|
572
|
-
//
|
|
572
|
+
// Stack outputs
|
|
573
573
|
export const vnetId = network.vpcId;
|
|
574
574
|
export const clusterEndpoint = cluster.endpoint;
|
|
575
575
|
export const zoneId = dns.zoneId;
|
|
@@ -724,7 +724,7 @@ const glb = createGlobalLoadBalancer("${name}", {
|
|
|
724
724
|
dnsProvider: "route53",
|
|
725
725
|
});
|
|
726
726
|
|
|
727
|
-
//
|
|
727
|
+
// Stack outputs
|
|
728
728
|
export const awsVpcId = networks[0]?.vpcId;
|
|
729
729
|
export const azureVnetId = networks[1]?.vpcId;
|
|
730
730
|
export const awsEndpoint = clusters[0]?.endpoint;
|
package/dist/cjs/cli.js
CHANGED
|
@@ -159,11 +159,9 @@ function newProject(args) {
|
|
|
159
159
|
const files = templateInfo.generate(name);
|
|
160
160
|
(0, fs_1.writeFileSync)((0, path_1.join)(dir, "index.ts"), files.indexTs);
|
|
161
161
|
(0, fs_1.writeFileSync)((0, path_1.join)(dir, "README.md"), files.readmeMd);
|
|
162
|
-
// 2. Install nimbus
|
|
163
|
-
const providerPkgs = templateInfo.providers.flatMap((p) => PROVIDER_PACKAGES[p] ?? []);
|
|
164
|
-
const allPkgs = ["@reyemtech/nimbus", ...providerPkgs];
|
|
162
|
+
// 2. Install nimbus (all provider SDKs are bundled as dependencies)
|
|
165
163
|
try {
|
|
166
|
-
run(
|
|
164
|
+
run("npm install @reyemtech/nimbus", dir);
|
|
167
165
|
}
|
|
168
166
|
catch (error) {
|
|
169
167
|
const detail = error instanceof Error ? error.message : String(error);
|
package/dist/cjs/cli.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cli.js","sourceRoot":"","sources":["../../src/cli.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"cli.js","sourceRoot":"","sources":["../../src/cli.ts"],"names":[],"mappings":"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"}
|
|
@@ -25,14 +25,14 @@ export type ICreateClusterConfig = IClusterConfig & {
|
|
|
25
25
|
* @example
|
|
26
26
|
* ```typescript
|
|
27
27
|
* // Single cloud
|
|
28
|
-
* const cluster =
|
|
28
|
+
* const cluster = createCluster("prod", {
|
|
29
29
|
* cloud: "aws",
|
|
30
30
|
* nodePools: [{ name: "system", instanceType: "t4g.small", minNodes: 2, maxNodes: 3 }],
|
|
31
31
|
* providerOptions: { aws: { autoMode: true } },
|
|
32
32
|
* }, network);
|
|
33
33
|
*
|
|
34
34
|
* // Multi-cloud
|
|
35
|
-
* const clusters =
|
|
35
|
+
* const clusters = createCluster("prod", {
|
|
36
36
|
* cloud: ["aws", "azure"],
|
|
37
37
|
* nodePools: [...],
|
|
38
38
|
* providerOptions: {
|
|
@@ -42,5 +42,5 @@ export type ICreateClusterConfig = IClusterConfig & {
|
|
|
42
42
|
* }, networks);
|
|
43
43
|
* ```
|
|
44
44
|
*/
|
|
45
|
-
export declare function createCluster(name: string, config: ICreateClusterConfig, networks: INetwork | INetwork[]):
|
|
45
|
+
export declare function createCluster(name: string, config: ICreateClusterConfig, networks: INetwork | INetwork[]): ICluster | ICluster[];
|
|
46
46
|
//# sourceMappingURL=cluster.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cluster.d.ts","sourceRoot":"","sources":["../../../src/factories/cluster.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAEH,OAAO,KAAK,EAAE,QAAQ,EAAE,cAAc,EAAE,MAAM,YAAY,CAAC;AAC3D,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAC;AAG3C,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,SAAS,CAAC;
|
|
1
|
+
{"version":3,"file":"cluster.d.ts","sourceRoot":"","sources":["../../../src/factories/cluster.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAEH,OAAO,KAAK,EAAE,QAAQ,EAAE,cAAc,EAAE,MAAM,YAAY,CAAC;AAC3D,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAC;AAG3C,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,SAAS,CAAC;AAKhD,4CAA4C;AAC5C,MAAM,MAAM,oBAAoB,GAAG,cAAc,GAAG;IAClD,QAAQ,CAAC,eAAe,CAAC,EAAE,gBAAgB,CAAC;CAC7C,CAAC;AAEF;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA4BG;AACH,wBAAgB,aAAa,CAC3B,IAAI,EAAE,MAAM,EACZ,MAAM,EAAE,oBAAoB,EAC5B,QAAQ,EAAE,QAAQ,GAAG,QAAQ,EAAE,GAC9B,QAAQ,GAAG,QAAQ,EAAE,CAoBvB"}
|
|
@@ -7,43 +7,12 @@
|
|
|
7
7
|
*
|
|
8
8
|
* @module factories/cluster
|
|
9
9
|
*/
|
|
10
|
-
var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
|
|
11
|
-
if (k2 === undefined) k2 = k;
|
|
12
|
-
var desc = Object.getOwnPropertyDescriptor(m, k);
|
|
13
|
-
if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
|
|
14
|
-
desc = { enumerable: true, get: function() { return m[k]; } };
|
|
15
|
-
}
|
|
16
|
-
Object.defineProperty(o, k2, desc);
|
|
17
|
-
}) : (function(o, m, k, k2) {
|
|
18
|
-
if (k2 === undefined) k2 = k;
|
|
19
|
-
o[k2] = m[k];
|
|
20
|
-
}));
|
|
21
|
-
var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
|
|
22
|
-
Object.defineProperty(o, "default", { enumerable: true, value: v });
|
|
23
|
-
}) : function(o, v) {
|
|
24
|
-
o["default"] = v;
|
|
25
|
-
});
|
|
26
|
-
var __importStar = (this && this.__importStar) || (function () {
|
|
27
|
-
var ownKeys = function(o) {
|
|
28
|
-
ownKeys = Object.getOwnPropertyNames || function (o) {
|
|
29
|
-
var ar = [];
|
|
30
|
-
for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
|
|
31
|
-
return ar;
|
|
32
|
-
};
|
|
33
|
-
return ownKeys(o);
|
|
34
|
-
};
|
|
35
|
-
return function (mod) {
|
|
36
|
-
if (mod && mod.__esModule) return mod;
|
|
37
|
-
var result = {};
|
|
38
|
-
if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
|
|
39
|
-
__setModuleDefault(result, mod);
|
|
40
|
-
return result;
|
|
41
|
-
};
|
|
42
|
-
})();
|
|
43
10
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
44
11
|
exports.createCluster = createCluster;
|
|
45
12
|
const types_1 = require("../types");
|
|
46
13
|
const types_2 = require("./types");
|
|
14
|
+
const index_js_1 = require("../aws/index.js");
|
|
15
|
+
const index_js_2 = require("../azure/index.js");
|
|
47
16
|
/**
|
|
48
17
|
* Create a Kubernetes cluster (EKS/AKS) for one or more cloud providers.
|
|
49
18
|
*
|
|
@@ -56,14 +25,14 @@ const types_2 = require("./types");
|
|
|
56
25
|
* @example
|
|
57
26
|
* ```typescript
|
|
58
27
|
* // Single cloud
|
|
59
|
-
* const cluster =
|
|
28
|
+
* const cluster = createCluster("prod", {
|
|
60
29
|
* cloud: "aws",
|
|
61
30
|
* nodePools: [{ name: "system", instanceType: "t4g.small", minNodes: 2, maxNodes: 3 }],
|
|
62
31
|
* providerOptions: { aws: { autoMode: true } },
|
|
63
32
|
* }, network);
|
|
64
33
|
*
|
|
65
34
|
* // Multi-cloud
|
|
66
|
-
* const clusters =
|
|
35
|
+
* const clusters = createCluster("prod", {
|
|
67
36
|
* cloud: ["aws", "azure"],
|
|
68
37
|
* nodePools: [...],
|
|
69
38
|
* providerOptions: {
|
|
@@ -73,7 +42,7 @@ const types_2 = require("./types");
|
|
|
73
42
|
* }, networks);
|
|
74
43
|
* ```
|
|
75
44
|
*/
|
|
76
|
-
|
|
45
|
+
function createCluster(name, config, networks) {
|
|
77
46
|
if (!(0, types_2.isMultiCloud)(config.cloud)) {
|
|
78
47
|
const target = (0, types_1.resolveCloudTarget)(config.cloud);
|
|
79
48
|
const network = Array.isArray(networks) ? findNetworkForProvider(networks, target) : networks;
|
|
@@ -81,25 +50,23 @@ async function createCluster(name, config, networks) {
|
|
|
81
50
|
}
|
|
82
51
|
const targets = (0, types_1.resolveCloudTarget)(config.cloud);
|
|
83
52
|
const networkArray = Array.isArray(networks) ? networks : [networks];
|
|
84
|
-
return
|
|
53
|
+
return targets.map((target) => {
|
|
85
54
|
const network = findNetworkForProvider(networkArray, target);
|
|
86
55
|
return dispatchCluster(`${name}-${target.provider}`, config, target, network, config.providerOptions);
|
|
87
|
-
})
|
|
56
|
+
});
|
|
88
57
|
}
|
|
89
|
-
|
|
58
|
+
function dispatchCluster(name, config, target, network, opts) {
|
|
90
59
|
const targetConfig = { ...config, cloud: { provider: target.provider, region: target.region } };
|
|
91
60
|
switch (target.provider) {
|
|
92
61
|
case "aws": {
|
|
93
|
-
|
|
94
|
-
return createEksCluster(name, targetConfig, network, opts?.aws);
|
|
62
|
+
return (0, index_js_1.createEksCluster)(name, targetConfig, network, opts?.aws);
|
|
95
63
|
}
|
|
96
64
|
case "azure": {
|
|
97
65
|
const azureOpts = opts?.azure;
|
|
98
66
|
if (!azureOpts) {
|
|
99
67
|
throw new types_1.UnsupportedFeatureError("Azure requires providerOptions.azure.resourceGroupName", "azure");
|
|
100
68
|
}
|
|
101
|
-
|
|
102
|
-
return createAksCluster(name, targetConfig, network, {
|
|
69
|
+
return (0, index_js_2.createAksCluster)(name, targetConfig, network, {
|
|
103
70
|
resourceGroupName: azureOpts.resourceGroupName,
|
|
104
71
|
azureCni: azureOpts.azureCni,
|
|
105
72
|
virtualNodes: azureOpts.virtualNodes,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cluster.js","sourceRoot":"","sources":["../../../src/factories/cluster.ts"],"names":[],"mappings":";AAAA;;;;;;;GAOG
|
|
1
|
+
{"version":3,"file":"cluster.js","sourceRoot":"","sources":["../../../src/factories/cluster.ts"],"names":[],"mappings":"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"}
|
|
@@ -21,11 +21,11 @@ export type ICreateDnsConfig = IDnsConfig & {
|
|
|
21
21
|
*
|
|
22
22
|
* @example
|
|
23
23
|
* ```typescript
|
|
24
|
-
* const dns =
|
|
24
|
+
* const dns = createDns("prod", {
|
|
25
25
|
* cloud: "aws",
|
|
26
26
|
* zoneName: "example.com",
|
|
27
27
|
* });
|
|
28
28
|
* ```
|
|
29
29
|
*/
|
|
30
|
-
export declare function createDns(name: string, config: ICreateDnsConfig):
|
|
30
|
+
export declare function createDns(name: string, config: ICreateDnsConfig): IDns | IDns[];
|
|
31
31
|
//# sourceMappingURL=dns.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"dns.d.ts","sourceRoot":"","sources":["../../../src/factories/dns.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAEH,OAAO,KAAK,EAAE,IAAI,EAAE,UAAU,EAAE,MAAM,QAAQ,CAAC;AAG/C,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,SAAS,CAAC;
|
|
1
|
+
{"version":3,"file":"dns.d.ts","sourceRoot":"","sources":["../../../src/factories/dns.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAEH,OAAO,KAAK,EAAE,IAAI,EAAE,UAAU,EAAE,MAAM,QAAQ,CAAC;AAG/C,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,SAAS,CAAC;AAKhD,wCAAwC;AACxC,MAAM,MAAM,gBAAgB,GAAG,UAAU,GAAG;IAC1C,QAAQ,CAAC,eAAe,CAAC,EAAE,gBAAgB,CAAC;CAC7C,CAAC;AAEF;;;;;;;;;;;;;;;GAeG;AACH,wBAAgB,SAAS,CAAC,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,gBAAgB,GAAG,IAAI,GAAG,IAAI,EAAE,CAU/E"}
|
|
@@ -6,43 +6,12 @@
|
|
|
6
6
|
*
|
|
7
7
|
* @module factories/dns
|
|
8
8
|
*/
|
|
9
|
-
var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
|
|
10
|
-
if (k2 === undefined) k2 = k;
|
|
11
|
-
var desc = Object.getOwnPropertyDescriptor(m, k);
|
|
12
|
-
if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
|
|
13
|
-
desc = { enumerable: true, get: function() { return m[k]; } };
|
|
14
|
-
}
|
|
15
|
-
Object.defineProperty(o, k2, desc);
|
|
16
|
-
}) : (function(o, m, k, k2) {
|
|
17
|
-
if (k2 === undefined) k2 = k;
|
|
18
|
-
o[k2] = m[k];
|
|
19
|
-
}));
|
|
20
|
-
var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
|
|
21
|
-
Object.defineProperty(o, "default", { enumerable: true, value: v });
|
|
22
|
-
}) : function(o, v) {
|
|
23
|
-
o["default"] = v;
|
|
24
|
-
});
|
|
25
|
-
var __importStar = (this && this.__importStar) || (function () {
|
|
26
|
-
var ownKeys = function(o) {
|
|
27
|
-
ownKeys = Object.getOwnPropertyNames || function (o) {
|
|
28
|
-
var ar = [];
|
|
29
|
-
for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
|
|
30
|
-
return ar;
|
|
31
|
-
};
|
|
32
|
-
return ownKeys(o);
|
|
33
|
-
};
|
|
34
|
-
return function (mod) {
|
|
35
|
-
if (mod && mod.__esModule) return mod;
|
|
36
|
-
var result = {};
|
|
37
|
-
if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
|
|
38
|
-
__setModuleDefault(result, mod);
|
|
39
|
-
return result;
|
|
40
|
-
};
|
|
41
|
-
})();
|
|
42
9
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
43
10
|
exports.createDns = createDns;
|
|
44
11
|
const types_1 = require("../types");
|
|
45
12
|
const types_2 = require("./types");
|
|
13
|
+
const index_js_1 = require("../aws/index.js");
|
|
14
|
+
const index_js_2 = require("../azure/index.js");
|
|
46
15
|
/**
|
|
47
16
|
* Create a DNS zone for one or more cloud providers.
|
|
48
17
|
*
|
|
@@ -53,34 +22,32 @@ const types_2 = require("./types");
|
|
|
53
22
|
*
|
|
54
23
|
* @example
|
|
55
24
|
* ```typescript
|
|
56
|
-
* const dns =
|
|
25
|
+
* const dns = createDns("prod", {
|
|
57
26
|
* cloud: "aws",
|
|
58
27
|
* zoneName: "example.com",
|
|
59
28
|
* });
|
|
60
29
|
* ```
|
|
61
30
|
*/
|
|
62
|
-
|
|
31
|
+
function createDns(name, config) {
|
|
63
32
|
if (!(0, types_2.isMultiCloud)(config.cloud)) {
|
|
64
33
|
const target = (0, types_1.resolveCloudTarget)(config.cloud);
|
|
65
34
|
return dispatchDns(name, config, target, config.providerOptions);
|
|
66
35
|
}
|
|
67
36
|
const targets = (0, types_1.resolveCloudTarget)(config.cloud);
|
|
68
|
-
return
|
|
37
|
+
return targets.map((target) => dispatchDns(`${name}-${target.provider}`, config, target, config.providerOptions));
|
|
69
38
|
}
|
|
70
|
-
|
|
39
|
+
function dispatchDns(name, config, target, opts) {
|
|
71
40
|
const targetConfig = { ...config, cloud: { provider: target.provider, region: target.region } };
|
|
72
41
|
switch (target.provider) {
|
|
73
42
|
case "aws": {
|
|
74
|
-
|
|
75
|
-
return createRoute53Dns(name, targetConfig);
|
|
43
|
+
return (0, index_js_1.createRoute53Dns)(name, targetConfig);
|
|
76
44
|
}
|
|
77
45
|
case "azure": {
|
|
78
46
|
const azureOpts = opts?.azure;
|
|
79
47
|
if (!azureOpts) {
|
|
80
48
|
throw new types_1.UnsupportedFeatureError("Azure requires providerOptions.azure.resourceGroupName", "azure");
|
|
81
49
|
}
|
|
82
|
-
|
|
83
|
-
return createAzureDns(name, targetConfig, {
|
|
50
|
+
return (0, index_js_2.createAzureDns)(name, targetConfig, {
|
|
84
51
|
resourceGroupName: azureOpts.resourceGroupName,
|
|
85
52
|
});
|
|
86
53
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"dns.js","sourceRoot":"","sources":["../../../src/factories/dns.ts"],"names":[],"mappings":";AAAA;;;;;;GAMG
|
|
1
|
+
{"version":3,"file":"dns.js","sourceRoot":"","sources":["../../../src/factories/dns.ts"],"names":[],"mappings":";AAAA;;;;;;GAMG;;AA+BH,8BAUC;AAtCD,oCAAuE;AAGvE,mCAAuC;AACvC,8CAAmD;AACnD,gDAAmD;AAOnD;;;;;;;;;;;;;;;GAeG;AACH,SAAgB,SAAS,CAAC,IAAY,EAAE,MAAwB;IAC9D,IAAI,CAAC,IAAA,oBAAY,EAAC,MAAM,CAAC,KAAK,CAAC,EAAE,CAAC;QAChC,MAAM,MAAM,GAAG,IAAA,0BAAkB,EAAC,MAAM,CAAC,KAAK,CAAC,CAAC;QAChD,OAAO,WAAW,CAAC,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC,eAAe,CAAC,CAAC;IACnE,CAAC;IAED,MAAM,OAAO,GAAG,IAAA,0BAAkB,EAAC,MAAM,CAAC,KAAK,CAAC,CAAC;IACjD,OAAO,OAAO,CAAC,GAAG,CAAC,CAAC,MAAM,EAAE,EAAE,CAC5B,WAAW,CAAC,GAAG,IAAI,IAAI,MAAM,CAAC,QAAQ,EAAE,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC,eAAe,CAAC,CAClF,CAAC;AACJ,CAAC;AAED,SAAS,WAAW,CAClB,IAAY,EACZ,MAAkB,EAClB,MAA2B,EAC3B,IAAuB;IAEvB,MAAM,YAAY,GAAG,EAAE,GAAG,MAAM,EAAE,KAAK,EAAE,EAAE,QAAQ,EAAE,MAAM,CAAC,QAAQ,EAAE,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,EAAE,CAAC;IAEhG,QAAQ,MAAM,CAAC,QAAQ,EAAE,CAAC;QACxB,KAAK,KAAK,CAAC,CAAC,CAAC;YACX,OAAO,IAAA,2BAAgB,EAAC,IAAI,EAAE,YAAY,CAAC,CAAC;QAC9C,CAAC;QACD,KAAK,OAAO,CAAC,CAAC,CAAC;YACb,MAAM,SAAS,GAAG,IAAI,EAAE,KAAK,CAAC;YAC9B,IAAI,CAAC,SAAS,EAAE,CAAC;gBACf,MAAM,IAAI,+BAAuB,CAC/B,wDAAwD,EACxD,OAAO,CACR,CAAC;YACJ,CAAC;YACD,OAAO,IAAA,yBAAc,EAAC,IAAI,EAAE,YAAY,EAAE;gBACxC,iBAAiB,EAAE,SAAS,CAAC,iBAAiB;aAC/C,CAAC,CAAC;QACL,CAAC;QACD;YACE,MAAM,IAAI,+BAAuB,CAAC,KAAK,EAAE,MAAM,CAAC,QAAQ,CAAC,CAAC;IAC9D,CAAC;AACH,CAAC"}
|
|
@@ -23,19 +23,19 @@ export type ICreateNetworkConfig = INetworkConfig & {
|
|
|
23
23
|
* @example
|
|
24
24
|
* ```typescript
|
|
25
25
|
* // Single cloud
|
|
26
|
-
* const network =
|
|
26
|
+
* const network = createNetwork("prod", {
|
|
27
27
|
* cloud: "aws",
|
|
28
28
|
* cidr: "10.0.0.0/16",
|
|
29
29
|
* natStrategy: "fck-nat",
|
|
30
30
|
* });
|
|
31
31
|
*
|
|
32
32
|
* // Multi-cloud
|
|
33
|
-
* const networks =
|
|
33
|
+
* const networks = createNetwork("prod", {
|
|
34
34
|
* cloud: ["aws", "azure"],
|
|
35
35
|
* cidr: "10.0.0.0/16",
|
|
36
36
|
* providerOptions: { azure: { resourceGroupName: "my-rg" } },
|
|
37
37
|
* });
|
|
38
38
|
* ```
|
|
39
39
|
*/
|
|
40
|
-
export declare function createNetwork(name: string, config: ICreateNetworkConfig):
|
|
40
|
+
export declare function createNetwork(name: string, config: ICreateNetworkConfig): INetwork | INetwork[];
|
|
41
41
|
//# sourceMappingURL=network.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"network.d.ts","sourceRoot":"","sources":["../../../src/factories/network.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAEH,OAAO,KAAK,EAAE,QAAQ,EAAE,cAAc,EAAE,MAAM,YAAY,CAAC;AAI3D,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,SAAS,CAAC;
|
|
1
|
+
{"version":3,"file":"network.d.ts","sourceRoot":"","sources":["../../../src/factories/network.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAEH,OAAO,KAAK,EAAE,QAAQ,EAAE,cAAc,EAAE,MAAM,YAAY,CAAC;AAI3D,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,SAAS,CAAC;AAKhD,4CAA4C;AAC5C,MAAM,MAAM,oBAAoB,GAAG,cAAc,GAAG;IAClD,QAAQ,CAAC,eAAe,CAAC,EAAE,gBAAgB,CAAC;CAC7C,CAAC;AAEF;;;;;;;;;;;;;;;;;;;;;;;;GAwBG;AACH,wBAAgB,aAAa,CAAC,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,oBAAoB,GAAG,QAAQ,GAAG,QAAQ,EAAE,CAkB/F"}
|
|
@@ -7,44 +7,13 @@
|
|
|
7
7
|
*
|
|
8
8
|
* @module factories/network
|
|
9
9
|
*/
|
|
10
|
-
var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
|
|
11
|
-
if (k2 === undefined) k2 = k;
|
|
12
|
-
var desc = Object.getOwnPropertyDescriptor(m, k);
|
|
13
|
-
if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
|
|
14
|
-
desc = { enumerable: true, get: function() { return m[k]; } };
|
|
15
|
-
}
|
|
16
|
-
Object.defineProperty(o, k2, desc);
|
|
17
|
-
}) : (function(o, m, k, k2) {
|
|
18
|
-
if (k2 === undefined) k2 = k;
|
|
19
|
-
o[k2] = m[k];
|
|
20
|
-
}));
|
|
21
|
-
var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
|
|
22
|
-
Object.defineProperty(o, "default", { enumerable: true, value: v });
|
|
23
|
-
}) : function(o, v) {
|
|
24
|
-
o["default"] = v;
|
|
25
|
-
});
|
|
26
|
-
var __importStar = (this && this.__importStar) || (function () {
|
|
27
|
-
var ownKeys = function(o) {
|
|
28
|
-
ownKeys = Object.getOwnPropertyNames || function (o) {
|
|
29
|
-
var ar = [];
|
|
30
|
-
for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
|
|
31
|
-
return ar;
|
|
32
|
-
};
|
|
33
|
-
return ownKeys(o);
|
|
34
|
-
};
|
|
35
|
-
return function (mod) {
|
|
36
|
-
if (mod && mod.__esModule) return mod;
|
|
37
|
-
var result = {};
|
|
38
|
-
if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
|
|
39
|
-
__setModuleDefault(result, mod);
|
|
40
|
-
return result;
|
|
41
|
-
};
|
|
42
|
-
})();
|
|
43
10
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
44
11
|
exports.createNetwork = createNetwork;
|
|
45
12
|
const network_1 = require("../network");
|
|
46
13
|
const types_1 = require("../types");
|
|
47
14
|
const types_2 = require("./types");
|
|
15
|
+
const index_js_1 = require("../aws/index.js");
|
|
16
|
+
const index_js_2 = require("../azure/index.js");
|
|
48
17
|
/**
|
|
49
18
|
* Create a network (VPC/VNet) for one or more cloud providers.
|
|
50
19
|
*
|
|
@@ -56,46 +25,44 @@ const types_2 = require("./types");
|
|
|
56
25
|
* @example
|
|
57
26
|
* ```typescript
|
|
58
27
|
* // Single cloud
|
|
59
|
-
* const network =
|
|
28
|
+
* const network = createNetwork("prod", {
|
|
60
29
|
* cloud: "aws",
|
|
61
30
|
* cidr: "10.0.0.0/16",
|
|
62
31
|
* natStrategy: "fck-nat",
|
|
63
32
|
* });
|
|
64
33
|
*
|
|
65
34
|
* // Multi-cloud
|
|
66
|
-
* const networks =
|
|
35
|
+
* const networks = createNetwork("prod", {
|
|
67
36
|
* cloud: ["aws", "azure"],
|
|
68
37
|
* cidr: "10.0.0.0/16",
|
|
69
38
|
* providerOptions: { azure: { resourceGroupName: "my-rg" } },
|
|
70
39
|
* });
|
|
71
40
|
* ```
|
|
72
41
|
*/
|
|
73
|
-
|
|
42
|
+
function createNetwork(name, config) {
|
|
74
43
|
if (!(0, types_2.isMultiCloud)(config.cloud)) {
|
|
75
44
|
const target = (0, types_1.resolveCloudTarget)(config.cloud);
|
|
76
45
|
return dispatchNetwork(name, config, target, config.providerOptions);
|
|
77
46
|
}
|
|
78
47
|
const targets = (0, types_1.resolveCloudTarget)(config.cloud);
|
|
79
48
|
const cidrs = resolveMultiCloudCidrs(config.cidr, targets.length);
|
|
80
|
-
return
|
|
49
|
+
return targets.map((target, i) => {
|
|
81
50
|
const perTargetConfig = { ...config, cloud: config.cloud, cidr: cidrs[i] };
|
|
82
51
|
return dispatchNetwork(`${name}-${target.provider}`, perTargetConfig, target, config.providerOptions);
|
|
83
|
-
})
|
|
52
|
+
});
|
|
84
53
|
}
|
|
85
|
-
|
|
54
|
+
function dispatchNetwork(name, config, target, opts) {
|
|
86
55
|
const targetConfig = { ...config, cloud: { provider: target.provider, region: target.region } };
|
|
87
56
|
switch (target.provider) {
|
|
88
57
|
case "aws": {
|
|
89
|
-
|
|
90
|
-
return createAwsNetwork(name, targetConfig, opts?.aws);
|
|
58
|
+
return (0, index_js_1.createAwsNetwork)(name, targetConfig, opts?.aws);
|
|
91
59
|
}
|
|
92
60
|
case "azure": {
|
|
93
61
|
const azureOpts = opts?.azure;
|
|
94
62
|
if (!azureOpts) {
|
|
95
63
|
throw new types_1.UnsupportedFeatureError("Azure requires providerOptions.azure.resourceGroupName", "azure");
|
|
96
64
|
}
|
|
97
|
-
|
|
98
|
-
return createAzureNetwork(name, targetConfig, {
|
|
65
|
+
return (0, index_js_2.createAzureNetwork)(name, targetConfig, {
|
|
99
66
|
resourceGroupName: azureOpts.resourceGroupName,
|
|
100
67
|
subnetCount: azureOpts.subnetCount,
|
|
101
68
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"network.js","sourceRoot":"","sources":["../../../src/factories/network.ts"],"names":[],"mappings":";AAAA;;;;;;;GAOG
|
|
1
|
+
{"version":3,"file":"network.js","sourceRoot":"","sources":["../../../src/factories/network.ts"],"names":[],"mappings":";AAAA;;;;;;;GAOG;;AAyCH,sCAkBC;AAxDD,wCAAwD;AACxD,oCAAuE;AAGvE,mCAAuC;AACvC,8CAAmD;AACnD,gDAAuD;AAOvD;;;;;;;;;;;;;;;;;;;;;;;;GAwBG;AACH,SAAgB,aAAa,CAAC,IAAY,EAAE,MAA4B;IACtE,IAAI,CAAC,IAAA,oBAAY,EAAC,MAAM,CAAC,KAAK,CAAC,EAAE,CAAC;QAChC,MAAM,MAAM,GAAG,IAAA,0BAAkB,EAAC,MAAM,CAAC,KAAK,CAAC,CAAC;QAChD,OAAO,eAAe,CAAC,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC,eAAe,CAAC,CAAC;IACvE,CAAC;IAED,MAAM,OAAO,GAAG,IAAA,0BAAkB,EAAC,MAAM,CAAC,KAAK,CAAC,CAAC;IACjD,MAAM,KAAK,GAAG,sBAAsB,CAAC,MAAM,CAAC,IAAI,EAAE,OAAO,CAAC,MAAM,CAAC,CAAC;IAElE,OAAO,OAAO,CAAC,GAAG,CAAC,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE;QAC/B,MAAM,eAAe,GAAG,EAAE,GAAG,MAAM,EAAE,KAAK,EAAE,MAAM,CAAC,KAAK,EAAE,IAAI,EAAE,KAAK,CAAC,CAAC,CAAC,EAAE,CAAC;QAC3E,OAAO,eAAe,CACpB,GAAG,IAAI,IAAI,MAAM,CAAC,QAAQ,EAAE,EAC5B,eAAe,EACf,MAAM,EACN,MAAM,CAAC,eAAe,CACvB,CAAC;IACJ,CAAC,CAAC,CAAC;AACL,CAAC;AAED,SAAS,eAAe,CACtB,IAAY,EACZ,MAAsB,EACtB,MAA2B,EAC3B,IAAuB;IAEvB,MAAM,YAAY,GAAG,EAAE,GAAG,MAAM,EAAE,KAAK,EAAE,EAAE,QAAQ,EAAE,MAAM,CAAC,QAAQ,EAAE,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,EAAE,CAAC;IAEhG,QAAQ,MAAM,CAAC,QAAQ,EAAE,CAAC;QACxB,KAAK,KAAK,CAAC,CAAC,CAAC;YACX,OAAO,IAAA,2BAAgB,EAAC,IAAI,EAAE,YAAY,EAAE,IAAI,EAAE,GAAG,CAAC,CAAC;QACzD,CAAC;QACD,KAAK,OAAO,CAAC,CAAC,CAAC;YACb,MAAM,SAAS,GAAG,IAAI,EAAE,KAAK,CAAC;YAC9B,IAAI,CAAC,SAAS,EAAE,CAAC;gBACf,MAAM,IAAI,+BAAuB,CAC/B,wDAAwD,EACxD,OAAO,CACR,CAAC;YACJ,CAAC;YACD,OAAO,IAAA,6BAAkB,EAAC,IAAI,EAAE,YAAY,EAAE;gBAC5C,iBAAiB,EAAE,SAAS,CAAC,iBAAiB;gBAC9C,WAAW,EAAE,SAAS,CAAC,WAAW;aACnC,CAAC,CAAC;QACL,CAAC;QACD;YACE,MAAM,IAAI,+BAAuB,CAAC,SAAS,EAAE,MAAM,CAAC,QAAQ,CAAC,CAAC;IAClE,CAAC;AACH,CAAC;AAED;;;;GAIG;AACH,SAAS,sBAAsB,CAAC,IAAwB,EAAE,KAAa;IACrE,IAAI,CAAC,IAAI,EAAE,CAAC;QACV,OAAO,IAAA,yBAAe,EAAC,KAAK,CAAC,CAAC;IAChC,CAAC;IAED,MAAM,MAAM,GAAG,IAAA,mBAAS,EAAC,IAAI,CAAC,CAAC;IAC/B,MAAM,WAAW,GAAG,CAAC,MAAM,CAAC,KAAK,KAAK,EAAE,CAAC,GAAG,IAAI,CAAC;IACjD,OAAO,IAAA,yBAAe,EAAC,KAAK,EAAE,EAAE,IAAI,EAAE,WAAW,EAAE,CAAC,CAAC;AACvD,CAAC"}
|
|
@@ -21,12 +21,12 @@ export type ICreateSecretsConfig = ISecretsConfig & {
|
|
|
21
21
|
*
|
|
22
22
|
* @example
|
|
23
23
|
* ```typescript
|
|
24
|
-
* const secrets =
|
|
24
|
+
* const secrets = createSecrets("prod", {
|
|
25
25
|
* cloud: "aws",
|
|
26
26
|
* backend: "aws-secrets-manager",
|
|
27
27
|
* });
|
|
28
28
|
*
|
|
29
|
-
* const secrets =
|
|
29
|
+
* const secrets = createSecrets("prod", {
|
|
30
30
|
* cloud: "azure",
|
|
31
31
|
* backend: "azure-key-vault",
|
|
32
32
|
* providerOptions: {
|
|
@@ -35,5 +35,5 @@ export type ICreateSecretsConfig = ISecretsConfig & {
|
|
|
35
35
|
* });
|
|
36
36
|
* ```
|
|
37
37
|
*/
|
|
38
|
-
export declare function createSecrets(name: string, config: ICreateSecretsConfig):
|
|
38
|
+
export declare function createSecrets(name: string, config: ICreateSecretsConfig): ISecrets | ISecrets[];
|
|
39
39
|
//# sourceMappingURL=secrets.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"secrets.d.ts","sourceRoot":"","sources":["../../../src/factories/secrets.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAEH,OAAO,KAAK,EAAE,QAAQ,EAAE,cAAc,EAAE,MAAM,YAAY,CAAC;AAG3D,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,SAAS,CAAC;
|
|
1
|
+
{"version":3,"file":"secrets.d.ts","sourceRoot":"","sources":["../../../src/factories/secrets.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAEH,OAAO,KAAK,EAAE,QAAQ,EAAE,cAAc,EAAE,MAAM,YAAY,CAAC;AAG3D,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,SAAS,CAAC;AAKhD,4CAA4C;AAC5C,MAAM,MAAM,oBAAoB,GAAG,cAAc,GAAG;IAClD,QAAQ,CAAC,eAAe,CAAC,EAAE,gBAAgB,CAAC;CAC7C,CAAC;AAEF;;;;;;;;;;;;;;;;;;;;;;;GAuBG;AACH,wBAAgB,aAAa,CAAC,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,oBAAoB,GAAG,QAAQ,GAAG,QAAQ,EAAE,CAU/F"}
|