@infoxchange/make-it-so 2.9.0-internal-testing-set-http-proxy-env-var-2.3 → 2.9.0-internal-testing-set-http-proxy-env-var-3.1

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.
Files changed (7) hide show
  1. package/dist/cdk-constructs/IxNextjsSite.d.ts.map +1 -1
  2. package/dist/cdk-constructs/IxNextjsSite.js +0 -3
  3. package/dist/lib/site/support.d.ts.map +1 -1
  4. package/dist/lib/site/support.js +26 -30
  5. package/package.json +1 -1
  6. package/src/cdk-constructs/IxNextjsSite.ts +0 -7
  7. package/src/lib/site/support.ts +33 -34
package/dist/cdk-constructs/IxNextjsSite.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"IxNextjsSite.d.ts","sourceRoot":"","sources":["../../src/cdk-constructs/IxNextjsSite.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,gBAAgB,CAAC;AAE5C,OAAO,EACL,KAAK,uBAAuB,EAe7B,MAAM,wBAAwB,CAAC;AAEhC,KAAK,cAAc,GAAG,qBAAqB,CAAC,OAAO,UAAU,CAAC,CAAC,CAAC,CAAC,CAAC;AAClE,KAAK,WAAW,GAAG,qBAAqB,CAAC,OAAO,UAAU,CAAC,CAAC,CAAC,CAAC,CAAC;AAC/D,KAAK,cAAc,GAAG,uBAAuB,CAAC;AAE9C,qBAAa,YAAa,SAAQ,UAAU;gBAExC,KAAK,EAAE,cAAc,EACrB,EAAE,EAAE,WAAW,EACf,KAAK,GAAE,cAAmB;IAyB5B,IAAW,aAAa,IAAI,MAAM,EAAE,CAEnC;IAED,IAAW,mBAAmB,IAAI,MAAM,GAAG,IAAI,CAE9C;IAED,IAAW,WAAW,IAAI,MAAM,GAAG,IAAI,CAEtC;IAED,IAAW,kBAAkB,IAAI,MAAM,EAAE,CAExC;IAED,IAAW,aAAa,IAAI,MAAM,GAAG,IAAI,CAExC;IAED,IAAW,aAAa,IAAI,MAAM,GAAG,IAAI,CAExC;CACF"}
1
+ {"version":3,"file":"IxNextjsSite.d.ts","sourceRoot":"","sources":["../../src/cdk-constructs/IxNextjsSite.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,gBAAgB,CAAC;AAE5C,OAAO,EACL,KAAK,uBAAuB,EAe7B,MAAM,wBAAwB,CAAC;AAEhC,KAAK,cAAc,GAAG,qBAAqB,CAAC,OAAO,UAAU,CAAC,CAAC,CAAC,CAAC,CAAC;AAClE,KAAK,WAAW,GAAG,qBAAqB,CAAC,OAAO,UAAU,CAAC,CAAC,CAAC,CAAC,CAAC;AAC/D,KAAK,cAAc,GAAG,uBAAuB,CAAC;AAE9C,qBAAa,YAAa,SAAQ,UAAU;gBAExC,KAAK,EAAE,cAAc,EACrB,EAAE,EAAE,WAAW,EACf,KAAK,GAAE,cAAmB;IAkB5B,IAAW,aAAa,IAAI,MAAM,EAAE,CAEnC;IAED,IAAW,mBAAmB,IAAI,MAAM,GAAG,IAAI,CAE9C;IAED,IAAW,WAAW,IAAI,MAAM,GAAG,IAAI,CAEtC;IAED,IAAW,kBAAkB,IAAI,MAAM,EAAE,CAExC;IAED,IAAW,aAAa,IAAI,MAAM,GAAG,IAAI,CAExC;IAED,IAAW,aAAa,IAAI,MAAM,GAAG,IAAI,CAExC;CACF"}
package/dist/cdk-constructs/IxNextjsSite.js CHANGED
@@ -4,16 +4,13 @@ import { getAliasDomain, getAlternativeDomains, getCustomDomains, getPrimaryCust
4
4
  export class IxNextjsSite extends NextjsSite {
5
5
  constructor(scope, id, props = {}) {
6
6
  if (ixDeployConfig.isIxDeploy) {
7
- console.log("props before", props);
8
7
  props = setupVpcDetails(scope, id, props);
9
- console.log("props after", props);
10
8
  props = setupCustomDomain(scope, id, props);
11
9
  props = setupCertificate(scope, id, props);
12
10
  props = setupDomainAliasRedirect(scope, id, props);
13
11
  }
14
12
  props = setupDefaultEnvVars(scope, id, props);
15
13
  props = applyConditionalEnvironmentVariables(scope, id, props);
16
- console.log("parentCompatibleSsrProps(props)", parentCompatibleSsrProps(props));
17
14
  super(scope, id, parentCompatibleSsrProps(props));
18
15
  if (ixDeployConfig.isIxDeploy) {
19
16
  setupDnsRecords(this, scope, id, props);
package/dist/lib/site/support.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"support.d.ts","sourceRoot":"","sources":["../../../src/lib/site/support.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"support.d.ts","sourceRoot":"","sources":["../../../src/lib/site/support.ts"],"names":[],"mappings":"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"}
package/dist/lib/site/support.js CHANGED
@@ -70,38 +70,34 @@ export function setupDomainAliasRedirect(scope, id, props) {
70
70
  }
71
71
  export function setupVpcDetails(scope, id, props) {
72
72
  const updatedProps = { ...props };
73
- const vpcDetails = new IxVpcDetails(scope, id + "-IxVpcDetails");
74
- console.log("updatedProps.cdk", updatedProps.cdk);
75
- if (!updatedProps.cdk?.server || !("vpc" in updatedProps.cdk.server)) {
76
- console.log("adding vpc for default server");
77
- updatedProps.cdk = updatedProps.cdk ?? {};
78
- updatedProps.cdk.server = {
79
- ...updatedProps.cdk.server,
80
- vpc: vpcDetails.vpc,
81
- };
82
- if (!ixDeployConfig.vpcHttpProxy) {
83
- console.warn(`Attempting to add HTTP proxy environment variables to ${id} but the VPC_HTTP_PROXY env var is not configured.`);
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.
88
- updatedProps.environment = {
89
- HTTP_PROXY: { runtime: ixDeployConfig.vpcHttpProxy },
90
- HTTPS_PROXY: { runtime: ixDeployConfig.vpcHttpProxy },
91
- http_proxy: { runtime: ixDeployConfig.vpcHttpProxy },
92
- https_proxy: { runtime: ixDeployConfig.vpcHttpProxy },
93
- ...updatedProps.environment,
94
- };
73
+ // Don't make any changes if the user has set the VPC manually in any place
74
+ if ("vpc" in (updatedProps.cdk?.server || {}) ||
75
+ "vpc" in (updatedProps.cdk?.revalidation || {})) {
76
+ return updatedProps;
95
77
  }
96
- if (!updatedProps.cdk?.revalidation ||
97
- !("vpc" in updatedProps.cdk.revalidation)) {
98
- console.log("adding vpc for revalidation server");
99
- updatedProps.cdk = props.cdk ?? {};
100
- updatedProps.cdk.revalidation = {
101
- ...updatedProps.cdk.revalidation,
102
- vpc: vpcDetails.vpc,
103
- };
78
+ const vpcDetails = new IxVpcDetails(scope, id + "-IxVpcDetails");
79
+ updatedProps.cdk = updatedProps.cdk ?? {};
80
+ updatedProps.cdk.server = {
81
+ ...updatedProps.cdk.server,
82
+ vpc: vpcDetails.vpc,
83
+ };
84
+ updatedProps.cdk.revalidation = {
85
+ ...updatedProps.cdk.revalidation,
86
+ vpc: vpcDetails.vpc,
87
+ };
88
+ if (!ixDeployConfig.vpcHttpProxy) {
89
+ console.warn(`Attempting to add HTTP proxy environment variables to ${id} but the VPC_HTTP_PROXY env var is not configured.`);
104
90
  }
91
+ // If we're using the AWS runner then the build stage will already be inside the VPC and required the proxy but
92
+ // the HTTP proxy environment variables will be already set in the environment by the pipeline and so the build
93
+ // stage will inherit that.
94
+ updatedProps.environment = {
95
+ HTTP_PROXY: { runtime: ixDeployConfig.vpcHttpProxy },
96
+ HTTPS_PROXY: { runtime: ixDeployConfig.vpcHttpProxy },
97
+ http_proxy: { runtime: ixDeployConfig.vpcHttpProxy },
98
+ https_proxy: { runtime: ixDeployConfig.vpcHttpProxy },
99
+ ...updatedProps.environment,
100
+ };
105
101
  return updatedProps;
106
102
  }
107
103
  /**
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",
3
+ "version": "2.9.0-internal-testing-set-http-proxy-env-var-3.1",
4
4
  "description": "Makes deploying services to IX infra easy",
5
5
  "repository": "github:infoxchange/make-it-so",
6
6
  "type": "module",
package/src/cdk-constructs/IxNextjsSite.ts CHANGED
@@ -29,9 +29,7 @@ export class IxNextjsSite extends NextjsSite {
29
29
  props: ConstructProps = {},
30
30
  ) {
31
31
  if (ixDeployConfig.isIxDeploy) {
32
- console.log("props before", props);
33
32
  props = setupVpcDetails(scope, id, props);
34
- console.log("props after", props);
35
33
  props = setupCustomDomain(scope, id, props);
36
34
  props = setupCertificate(scope, id, props);
37
35
  props = setupDomainAliasRedirect(scope, id, props);
@@ -39,11 +37,6 @@ export class IxNextjsSite extends NextjsSite {
39
37
  props = setupDefaultEnvVars(scope, id, props);
40
38
  props = applyConditionalEnvironmentVariables(scope, id, props);
41
39
 
42
- console.log(
43
- "parentCompatibleSsrProps(props)",
44
- parentCompatibleSsrProps(props),
45
- );
46
-
47
40
  super(scope, id, parentCompatibleSsrProps(props));
48
41
 
49
42
  if (ixDeployConfig.isIxDeploy) {
package/src/lib/site/support.ts CHANGED
@@ -141,44 +141,43 @@ export function setupVpcDetails<Props extends ExtendedNextjsSiteProps>(
141
141
  props: Readonly<Props>,
142
142
  ): Props {
143
143
  const updatedProps: Props = { ...props };
144
- const vpcDetails = new IxVpcDetails(scope, id + "-IxVpcDetails");
145
- console.log("updatedProps.cdk", updatedProps.cdk);
146
- if (!updatedProps.cdk?.server || !("vpc" in updatedProps.cdk.server)) {
147
- console.log("adding vpc for default server");
148
- updatedProps.cdk = updatedProps.cdk ?? {};
149
- updatedProps.cdk.server = {
150
- ...updatedProps.cdk.server,
151
- vpc: vpcDetails.vpc,
152
- };
153
-
154
- if (!ixDeployConfig.vpcHttpProxy) {
155
- console.warn(
156
- `Attempting to add HTTP proxy environment variables to ${id} but the VPC_HTTP_PROXY env var is not configured.`,
157
- );
158
- }
159
144
 
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.
163
- updatedProps.environment = {
164
- HTTP_PROXY: { runtime: ixDeployConfig.vpcHttpProxy },
165
- HTTPS_PROXY: { runtime: ixDeployConfig.vpcHttpProxy },
166
- http_proxy: { runtime: ixDeployConfig.vpcHttpProxy },
167
- https_proxy: { runtime: ixDeployConfig.vpcHttpProxy },
168
- ...updatedProps.environment,
169
- };
170
- }
145
+ // Don't make any changes if the user has set the VPC manually in any place
171
146
  if (
172
- !updatedProps.cdk?.revalidation ||
173
- !("vpc" in updatedProps.cdk.revalidation)
147
+ "vpc" in (updatedProps.cdk?.server || {}) ||
148
+ "vpc" in (updatedProps.cdk?.revalidation || {})
174
149
  ) {
175
- console.log("adding vpc for revalidation server");
176
- updatedProps.cdk = props.cdk ?? {};
177
- updatedProps.cdk.revalidation = {
178
- ...updatedProps.cdk.revalidation,
179
- vpc: vpcDetails.vpc,
180
- };
150
+ return updatedProps;
181
151
  }
152
+
153
+ const vpcDetails = new IxVpcDetails(scope, id + "-IxVpcDetails");
154
+
155
+ updatedProps.cdk = updatedProps.cdk ?? {};
156
+ updatedProps.cdk.server = {
157
+ ...updatedProps.cdk.server,
158
+ vpc: vpcDetails.vpc,
159
+ };
160
+ updatedProps.cdk.revalidation = {
161
+ ...updatedProps.cdk.revalidation,
162
+ vpc: vpcDetails.vpc,
163
+ };
164
+
165
+ if (!ixDeployConfig.vpcHttpProxy) {
166
+ console.warn(
167
+ `Attempting to add HTTP proxy environment variables to ${id} but the VPC_HTTP_PROXY env var is not configured.`,
168
+ );
169
+ }
170
+ // If we're using the AWS runner then the build stage will already be inside the VPC and required the proxy but
171
+ // the HTTP proxy environment variables will be already set in the environment by the pipeline and so the build
172
+ // stage will inherit that.
173
+ updatedProps.environment = {
174
+ HTTP_PROXY: { runtime: ixDeployConfig.vpcHttpProxy },
175
+ HTTPS_PROXY: { runtime: ixDeployConfig.vpcHttpProxy },
176
+ http_proxy: { runtime: ixDeployConfig.vpcHttpProxy },
177
+ https_proxy: { runtime: ixDeployConfig.vpcHttpProxy },
178
+ ...updatedProps.environment,
179
+ };
180
+
182
181
  return updatedProps;
183
182
  }
184
183