Remove unnecessayr usage of APIGateway from tests. (pulumi#258)

GlennPrince · Mar 13, 2019 · f93239b · f93239b
1 parent 705ef3e
commit f93239b
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 23 deletions.
diff --git a/aws-js-containers/index.js b/aws-js-containers/index.js
@@ -1,9 +1,14 @@
+const pulumi = require("@pulumi/pulumi");
 const awsx = require("@pulumi/awsx");
 
-let cluster = new awsx.ecs.Cluster("example", { });
-let listener= new awsx.elasticloadbalancingv2.NetworkListener("nginx", { port: 80 });
+// Create an elastic network listener to listen for requests and route them to the container.
+// See https://docs.aws.amazon.com/elasticloadbalancing/latest/network/introduction.html
+// for more details.
+let listener = new awsx.elasticloadbalancingv2.NetworkListener("nginx", { port: 80 });
+
+// Define the service to run. We pass in the listener to hook up the network load balancer
+// to the containers the service will launch.
 let service = new awsx.ecs.FargateService("nginx", {
- cluster,
  desiredCount: 2,
  taskDefinitionArgs: {
  containers: {
@@ -16,12 +21,4 @@ let service = new awsx.ecs.FargateService("nginx", {
  },
 });
 
-// expose some APIs meant for testing purposes.
-let api = new awsx.apigateway.API("containers", {
- routes: [{
- path: "/nginx",
- target: listener,
- }],
-});
-
-exports.frontendURL = api.url;
+exports.frontendURL = pulumi.interpolate `https://${listener.endpoint.hostname}/`;
diff --git a/aws-ts-containers/index.ts b/aws-ts-containers/index.ts
@@ -21,12 +21,4 @@ let service = new awsx.ecs.FargateService("nginx", {
  },
 });
 
-// expose some APIs meant for testing purposes.
-const api = new awsx.apigateway.API("containers", {
- routes: [{
- path: "/nginx",
- target: listener,
- }],
-});
-
-export let frontendURL = api.url;
+export let frontendURL = pulumi.interpolate `https://${listener.endpoint.hostname}/`;
diff --git a/misc/test/examples_test.go b/misc/test/examples_test.go
@@ -53,7 +53,7 @@ func TestExamples(t *testing.T) {
  ExtraRuntimeValidation: func(t *testing.T, stack integration.RuntimeValidationStackInfo) {
  maxWait := 10 * time.Minute
  endpoint := stack.Outputs["frontendURL"].(string)
- assertHTTPResultWithRetry(t, endpoint+"nginx", maxWait, func(body string) bool {
+ assertHTTPResultWithRetry(t, endpoint, maxWait, func(body string) bool {
  return assert.Contains(t, body, "Hello, Pulumi!")
  })
  },
@@ -140,7 +140,7 @@ func TestExamples(t *testing.T) {
  ExtraRuntimeValidation: func(t *testing.T, stack integration.RuntimeValidationStackInfo) {
  maxWait := 10 * time.Minute
  endpoint := stack.Outputs["frontendURL"].(string)
- assertHTTPResultWithRetry(t, endpoint+"nginx", maxWait, func(body string) bool {
+ assertHTTPResultWithRetry(t, endpoint, maxWait, func(body string) bool {
  return assert.Contains(t, body, "Hello, Pulumi!")
  })
  },