Skip to content

Commit 048d9b3

Browse files
committed
v2.0.5 wip
1 parent e3097b0 commit 048d9b3

5 files changed

Lines changed: 31 additions & 33 deletions

File tree

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ stackql_history.txt
88
stackql.log
99
stackql-zip
1010
stackql-deploy
11+
.stackql-deploy-exports
1112
.env
1213
nohup.out
1314
contributors.csv

.stackql-deploy-exports

Lines changed: 0 additions & 8 deletions
This file was deleted.

examples/aws/aws-vpc-webserver/README.md

Lines changed: 26 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -5,22 +5,17 @@ This example provisions a complete AWS networking stack with an Apache web serve
55
## Architecture
66

77
```mermaid
8-
architecture-beta
9-
group vpc(logos:aws-vpc)[VPC 10.x.0.0/16]
10-
11-
service subnet(logos:aws-vpc)[Subnet 10.x.1.0/24] in vpc
12-
service rt(logos:aws-route-53)[Route Table] in vpc
13-
service sg(logos:aws-shield)[Security Group] in vpc
14-
service ec2(logos:aws-ec2)[Web Server t2.micro] in vpc
15-
16-
group edge(logos:aws-cloudfront)[Edge]
17-
18-
service igw(logos:aws-api-gateway)[Internet Gateway] in edge
19-
20-
igw:R --> L:rt
21-
rt:B -- T:subnet
22-
sg:R -- L:ec2
23-
subnet:T -- B:ec2
8+
flowchart LR
9+
subgraph VPC["VPC 10.x.0.0/16"]
10+
Subnet["Subnet\n10.x.1.0/24"]
11+
RT["Route Table"]
12+
SG["Security Group\nHTTP:80, SSH:22"]
13+
EC2["Web Server\nt2.micro"]
14+
Subnet --> EC2
15+
SG --> EC2
16+
end
17+
IGW["Internet\nGateway"] --> RT --> Subnet
18+
Internet(("Internet")) --> IGW
2419
```
2520

2621
## Resources
@@ -62,37 +57,46 @@ architecture-beta
6257
### Deploy
6358

6459
```bash
65-
stackql-deploy build examples/aws/aws-vpc-webserver dev
60+
target/release/stackql-deploy build examples/aws/aws-vpc-webserver dev \
61+
-e AWS_REGION=${AWS_REGION}
6662
```
6763

6864
With query visibility:
6965

7066
```bash
71-
stackql-deploy build examples/aws/aws-vpc-webserver dev --show-queries
67+
target/release/stackql-deploy build examples/aws/aws-vpc-webserver dev \
68+
-e AWS_REGION=${AWS_REGION} \
69+
--show-queries
7270
```
7371

7472
Dry run (no changes):
7573

7674
```bash
77-
stackql-deploy build examples/aws/aws-vpc-webserver dev --dry-run --show-queries
75+
target/release/stackql-deploy build examples/aws/aws-vpc-webserver dev \
76+
-e AWS_REGION=${AWS_REGION} \
77+
--dry-run --show-queries
7878
```
7979

8080
### Test
8181

8282
```bash
83-
stackql-deploy test examples/aws/aws-vpc-webserver dev
83+
target/release/stackql-deploy test examples/aws/aws-vpc-webserver dev \
84+
-e AWS_REGION=${AWS_REGION}
8485
```
8586

8687
### Teardown
8788

8889
```bash
89-
stackql-deploy teardown examples/aws/aws-vpc-webserver dev
90+
target/release/stackql-deploy teardown examples/aws/aws-vpc-webserver dev \
91+
-e AWS_REGION=${AWS_REGION}
9092
```
9193

9294
### Debug mode
9395

9496
```bash
95-
stackql-deploy build examples/aws/aws-vpc-webserver dev --log-level debug
97+
target/release/stackql-deploy build examples/aws/aws-vpc-webserver dev \
98+
-e AWS_REGION=${AWS_REGION} \
99+
--log-level debug
96100
```
97101

98102
## How It Works

examples/aws/aws-vpc-webserver/stackql_manifest.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -143,3 +143,6 @@ resources:
143143
props: []
144144
exports:
145145
- public_dns_name
146+
147+
exports:
148+
- public_dns_name

src/commands/test.rs

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -297,7 +297,5 @@ fn run_test(
297297
let elapsed_str = format!("{:.2?}", elapsed);
298298
info!("test completed in {}", elapsed_str);
299299

300-
if let Some(of) = output_file {
301-
runner.process_stack_exports(dry_run, Some(of), &elapsed_str);
302-
}
300+
runner.process_stack_exports(dry_run, output_file, &elapsed_str);
303301
}

0 commit comments

Comments
 (0)