@infoxchange/make-it-so 2.9.0-internal-testing-set-http-proxy-env-var-2.1 → 2.9.0-internal-testing-set-http-proxy-env-var-2.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.
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"support.d.ts","sourceRoot":"","sources":["../../../src/lib/site/support.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,YAAY,CAAC;AACvC,OAAO,EACL,UAAU,EACV,eAAe,EACf,KAAK,EACL,UAAU,EACV,eAAe,EAChB,MAAM,gBAAgB,CAAC;AAQxB,OAAO,EAAE,KAAK,uBAAuB,EAAE,MAAM,gCAAgC,CAAC;AAG9E,MAAM,MAAM,qBAAqB,GAAG,uBAAuB,GAAG;IAC5D,iBAAiB,CAAC,EAAE,OAAO,CAAC;IAC5B,uBAAuB,CAAC,EAAE,MAAM,EAAE,CAAC;CACpC,CAAC;AACF,MAAM,MAAM,uBAAuB,GAAG,IAAI,CACxC,eAAe,EACf,cAAc,GAAG,aAAa,CAC/B,GAAG;IACF,YAAY,CAAC,EAAE,MAAM,GAAG,qBAAqB,CAAC;IAC9C;;;;;;;;;;;;;;;;;;OAkBG;IACH,WAAW,CAAC,EAAE,MAAM,CAClB,MAAM,EACN,MAAM,GAAG;QAAE,SAAS,CAAC,EAAE,MAAM,CAAC;QAAC,OAAO,CAAC,EAAE,MAAM,CAAA;KAAE,CAClD,CAAC;CACH,CAAC;AAEF,MAAM,MAAM,uBAAuB,GAAG,IAAI,CAAC,eAAe,EAAE,cAAc,CAAC,GAAG;IAC5E,YAAY,CAAC,EAAE,MAAM,GAAG,qBAAqB,CAAC;CAC/C,CAAC;AAEF,wBAAgB,iBAAiB,CAC/B,KAAK,SAAS,uBAAuB,GAAG,uBAAuB,EAC/D,KAAK,EAAE,SAAS,EAAE,EAAE,EAAE,MAAM,EAAE,KAAK,EAAE,QAAQ,CAAC,KAAK,CAAC,GAAG,KAAK,CAiB7D;AAED,wBAAgB,gBAAgB,CAC9B,KAAK,SAAS,uBAAuB,GAAG,uBAAuB,EAC/D,KAAK,EAAE,SAAS,EAAE,EAAE,EAAE,MAAM,EAAE,KAAK,EAAE,QAAQ,CAAC,KAAK,CAAC,GAAG,KAAK,CAyB7D;AAED,wBAAgB,wBAAwB,CACtC,KAAK,SAAS,uBAAuB,GAAG,uBAAuB,EAC/D,KAAK,EAAE,SAAS,EAAE,EAAE,EAAE,MAAM,EAAE,KAAK,EAAE,QAAQ,CAAC,KAAK,CAAC,GAAG,KAAK,CA2B7D;AAED,wBAAgB,eAAe,CAAC,KAAK,SAAS,uBAAuB,EACnE,KAAK,EAAE,SAAS,EAChB,EAAE,EAAE,MAAM,EACV,KAAK,EAAE,QAAQ,CAAC,KAAK,CAAC,GACrB,KAAK,
|
|
1
|
+
{"version":3,"file":"support.d.ts","sourceRoot":"","sources":["../../../src/lib/site/support.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,YAAY,CAAC;AACvC,OAAO,EACL,UAAU,EACV,eAAe,EACf,KAAK,EACL,UAAU,EACV,eAAe,EAChB,MAAM,gBAAgB,CAAC;AAQxB,OAAO,EAAE,KAAK,uBAAuB,EAAE,MAAM,gCAAgC,CAAC;AAG9E,MAAM,MAAM,qBAAqB,GAAG,uBAAuB,GAAG;IAC5D,iBAAiB,CAAC,EAAE,OAAO,CAAC;IAC5B,uBAAuB,CAAC,EAAE,MAAM,EAAE,CAAC;CACpC,CAAC;AACF,MAAM,MAAM,uBAAuB,GAAG,IAAI,CACxC,eAAe,EACf,cAAc,GAAG,aAAa,CAC/B,GAAG;IACF,YAAY,CAAC,EAAE,MAAM,GAAG,qBAAqB,CAAC;IAC9C;;;;;;;;;;;;;;;;;;OAkBG;IACH,WAAW,CAAC,EAAE,MAAM,CAClB,MAAM,EACN,MAAM,GAAG;QAAE,SAAS,CAAC,EAAE,MAAM,CAAC;QAAC,OAAO,CAAC,EAAE,MAAM,CAAA;KAAE,CAClD,CAAC;CACH,CAAC;AAEF,MAAM,MAAM,uBAAuB,GAAG,IAAI,CAAC,eAAe,EAAE,cAAc,CAAC,GAAG;IAC5E,YAAY,CAAC,EAAE,MAAM,GAAG,qBAAqB,CAAC;CAC/C,CAAC;AAEF,wBAAgB,iBAAiB,CAC/B,KAAK,SAAS,uBAAuB,GAAG,uBAAuB,EAC/D,KAAK,EAAE,SAAS,EAAE,EAAE,EAAE,MAAM,EAAE,KAAK,EAAE,QAAQ,CAAC,KAAK,CAAC,GAAG,KAAK,CAiB7D;AAED,wBAAgB,gBAAgB,CAC9B,KAAK,SAAS,uBAAuB,GAAG,uBAAuB,EAC/D,KAAK,EAAE,SAAS,EAAE,EAAE,EAAE,MAAM,EAAE,KAAK,EAAE,QAAQ,CAAC,KAAK,CAAC,GAAG,KAAK,CAyB7D;AAED,wBAAgB,wBAAwB,CACtC,KAAK,SAAS,uBAAuB,GAAG,uBAAuB,EAC/D,KAAK,EAAE,SAAS,EAAE,EAAE,EAAE,MAAM,EAAE,KAAK,EAAE,QAAQ,CAAC,KAAK,CAAC,GAAG,KAAK,CA2B7D;AAED,wBAAgB,eAAe,CAAC,KAAK,SAAS,uBAAuB,EACnE,KAAK,EAAE,SAAS,EAChB,EAAE,EAAE,MAAM,EACV,KAAK,EAAE,QAAQ,CAAC,KAAK,CAAC,GACrB,KAAK,CAyCP;AAED;;;GAGG;AACH,wBAAgB,oCAAoC,CAClD,KAAK,SAAS,uBAAuB,EACrC,KAAK,EAAE,SAAS,EAAE,EAAE,EAAE,MAAM,EAAE,KAAK,EAAE,QAAQ,CAAC,KAAK,CAAC,GAAG,KAAK,CA6D7D;AAED;;;GAGG;AACH,wBAAgB,wBAAwB,CACtC,KAAK,SAAS,uBAAuB,EACrC,WAAW,GAAG,IAAI,CAAC,KAAK,EAAE,aAAa,CAAC,GAAG;IACzC,WAAW,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;CACtC,EACD,KAAK,EAAE,QAAQ,CAAC,KAAK,CAAC,GAAG,WAAW,CASrC;AAED,wBAAgB,mBAAmB,CAAC,KAAK,SAAS,uBAAuB,EACvE,KAAK,EAAE,SAAS,GAAG,KAAK,EACxB,EAAE,EAAE,MAAM,EACV,KAAK,EAAE,QAAQ,CAAC,KAAK,CAAC,GACrB,KAAK,CAeP;AAED,wBAAgB,eAAe,CAC7B,QAAQ,SAAS,UAAU,GAAG,UAAU,EACxC,KAAK,SAAS,uBAAuB,GAAG,uBAAuB,EAE/D,QAAQ,EAAE,QAAQ,EAClB,KAAK,EAAE,SAAS,EAChB,EAAE,EAAE,MAAM,EACV,KAAK,EAAE,QAAQ,CAAC,KAAK,CAAC,GACrB,IAAI,CAmBN;AAED,wBAAgB,gBAAgB,CAC9B,KAAK,SAAS,uBAAuB,GAAG,uBAAuB,EAC/D,KAAK,EAAE,QAAQ,CAAC,KAAK,CAAC,GAAG,MAAM,EAAE,CAWlC;AAED,wBAAgB,gBAAgB,CAC9B,QAAQ,SAAS,UAAU,GAAG,UAAU,EACxC,KAAK,SAAS,uBAAuB,GAAG,uBAAuB,EAC/D,QAAQ,EAAE,QAAQ,EAAE,KAAK,EAAE,QAAQ,CAAC,KAAK,CAAC,GAAG,MAAM,GAAG,IAAI,CAM3D;AAED,wBAAgB,gBAAgB,CAC9B,QAAQ,SAAS,UAAU,GAAG,UAAU,EACxC,KAAK,SAAS,uBAAuB,GAAG,uBAAuB,EAC/D,QAAQ,EAAE,QAAQ,EAAE,KAAK,EAAE,QAAQ,CAAC,KAAK,CAAC,GAAG,MAAM,GAAG,IAAI,CAG3D;AAED,wBAAgB,sBAAsB,CACpC,KAAK,SAAS,uBAAuB,GAAG,uBAAuB,EAC/D,KAAK,EAAE,QAAQ,CAAC,KAAK,CAAC,GAAG,MAAM,GAAG,IAAI,CAOvC;AAED,wBAAgB,cAAc,CAC5B,KAAK,SAAS,uBAAuB,GAAG,uBAAuB,EAC/D,KAAK,EAAE,QAAQ,CAAC,KAAK,CAAC,GAAG,MAAM,GAAG,IAAI,CAKvC;AAED,wBAAgB,qBAAqB,CACnC,KAAK,SAAS,uBAAuB,GAAG,uBAAuB,EAC/D,KAAK,EAAE,QAAQ,CAAC,KAAK,CAAC,GAAG,MAAM,EAAE,CAKlC"}
|
package/dist/lib/site/support.js
CHANGED
|
@@ -71,7 +71,9 @@ export function setupDomainAliasRedirect(scope, id, props) {
|
|
|
71
71
|
export function setupVpcDetails(scope, id, props) {
|
|
72
72
|
const updatedProps = { ...props };
|
|
73
73
|
const vpcDetails = new IxVpcDetails(scope, id + "-IxVpcDetails");
|
|
74
|
+
console.log("updatedProps.cdk", updatedProps.cdk);
|
|
74
75
|
if (!updatedProps.cdk?.server || !("vpc" in updatedProps.cdk.server)) {
|
|
76
|
+
console.log("adding vpc for default server");
|
|
75
77
|
updatedProps.cdk = updatedProps.cdk ?? {};
|
|
76
78
|
updatedProps.cdk.server = {
|
|
77
79
|
...updatedProps.cdk.server,
|
|
@@ -80,6 +82,9 @@ export function setupVpcDetails(scope, id, props) {
|
|
|
80
82
|
if (!ixDeployConfig.vpcHttpProxy) {
|
|
81
83
|
console.warn(`Attempting to add HTTP proxy environment variables to ${id} but the VPC_HTTP_PROXY env var is not configured.`);
|
|
82
84
|
}
|
|
85
|
+
// If we're using the AWS runner then the build stage will already be inside the VPC and required the proxy but
|
|
86
|
+
// the HTTP proxy environment variables will be already set in the environment by the pipeline and so the build
|
|
87
|
+
// stage will inherit that.
|
|
83
88
|
updatedProps.environment = {
|
|
84
89
|
HTTP_PROXY: { runtime: ixDeployConfig.vpcHttpProxy },
|
|
85
90
|
HTTPS_PROXY: { runtime: ixDeployConfig.vpcHttpProxy },
|
|
@@ -90,6 +95,7 @@ export function setupVpcDetails(scope, id, props) {
|
|
|
90
95
|
}
|
|
91
96
|
if (!updatedProps.cdk?.revalidation ||
|
|
92
97
|
!("vpc" in updatedProps.cdk.revalidation)) {
|
|
98
|
+
console.log("adding vpc for revalidation server");
|
|
93
99
|
updatedProps.cdk = props.cdk ?? {};
|
|
94
100
|
updatedProps.cdk.revalidation = {
|
|
95
101
|
...updatedProps.cdk.revalidation,
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@infoxchange/make-it-so",
|
|
3
|
-
"version": "2.9.0-internal-testing-set-http-proxy-env-var-2.
|
|
3
|
+
"version": "2.9.0-internal-testing-set-http-proxy-env-var-2.2",
|
|
4
4
|
"description": "Makes deploying services to IX infra easy",
|
|
5
5
|
"repository": "github:infoxchange/make-it-so",
|
|
6
6
|
"type": "module",
|
package/src/lib/site/support.ts
CHANGED
|
@@ -142,7 +142,9 @@ export function setupVpcDetails<Props extends ExtendedNextjsSiteProps>(
|
|
|
142
142
|
): Props {
|
|
143
143
|
const updatedProps: Props = { ...props };
|
|
144
144
|
const vpcDetails = new IxVpcDetails(scope, id + "-IxVpcDetails");
|
|
145
|
+
console.log("updatedProps.cdk", updatedProps.cdk);
|
|
145
146
|
if (!updatedProps.cdk?.server || !("vpc" in updatedProps.cdk.server)) {
|
|
147
|
+
console.log("adding vpc for default server");
|
|
146
148
|
updatedProps.cdk = updatedProps.cdk ?? {};
|
|
147
149
|
updatedProps.cdk.server = {
|
|
148
150
|
...updatedProps.cdk.server,
|
|
@@ -155,6 +157,9 @@ export function setupVpcDetails<Props extends ExtendedNextjsSiteProps>(
|
|
|
155
157
|
);
|
|
156
158
|
}
|
|
157
159
|
|
|
160
|
+
// If we're using the AWS runner then the build stage will already be inside the VPC and required the proxy but
|
|
161
|
+
// the HTTP proxy environment variables will be already set in the environment by the pipeline and so the build
|
|
162
|
+
// stage will inherit that.
|
|
158
163
|
updatedProps.environment = {
|
|
159
164
|
HTTP_PROXY: { runtime: ixDeployConfig.vpcHttpProxy },
|
|
160
165
|
HTTPS_PROXY: { runtime: ixDeployConfig.vpcHttpProxy },
|
|
@@ -167,6 +172,7 @@ export function setupVpcDetails<Props extends ExtendedNextjsSiteProps>(
|
|
|
167
172
|
!updatedProps.cdk?.revalidation ||
|
|
168
173
|
!("vpc" in updatedProps.cdk.revalidation)
|
|
169
174
|
) {
|
|
175
|
+
console.log("adding vpc for revalidation server");
|
|
170
176
|
updatedProps.cdk = props.cdk ?? {};
|
|
171
177
|
updatedProps.cdk.revalidation = {
|
|
172
178
|
...updatedProps.cdk.revalidation,
|