updated starter template

Author: jeffreyaven

src/commands/build.rs

@@ -536,6 +536,25 @@ fn run_build(
 
             // Post-deploy state check
             if is_created_or_updated {
+                // After create/update, re-run the exists query to capture
+                // this.* fields (e.g. identifier) that are needed by the
+                // statecheck and exports queries.
+                if let Some(ref eq) = exists_query {
+                    let eq_opts = resource_queries.get("exists").unwrap();
+                    let (_exists, fields) = runner.check_if_resource_exists(
+                        resource,
+                        &eq.0,
+                        eq_opts.options.retries.max(3),
+                        eq_opts.options.retry_delay.max(5),
+                        dry_run,
+                        show_queries,
+                        false,
+                    );
+                    apply_exists_fields(fields, &resource.name, &mut full_context);
+                    // Re-render exports with the newly captured fields
+                    exports_query_str = render_exports!(runner, resource_queries, resource, &full_context);
+                }
+
                 if let Some(sq) = render_statecheck!(runner, resource_queries, resource, &full_context) {
                     let sq_opts = resource_queries.get("statecheck").unwrap();
                     is_correct_state = runner.check_if_resource_is_correct_state(

src/commands/init.rs

@@ -90,6 +90,14 @@ pub fn command() -> Command {
                 .action(ArgAction::Set)
                 .conflicts_with("provider"),
         )
+        .arg(
+            Arg::new("env")
+                .short('e')
+                .long("env")
+                .help("Default environment for examples in generated README (default: dev)")
+                .default_value("dev")
+                .action(ArgAction::Set),
+        )
 }
 
 /// Executes the `init` command to initialize a new project structure.

template-hub/aws/starter/README.md.template

@@ -1,46 +1,45 @@
 # `stackql-deploy` starter project for `aws`
 
-> for starter projects using other providers, try `stackql-deploy {{ stack_name }} --provider=azure` or `stackql-deploy {{ stack_name }} --provider=google`
+> for starter projects using other providers, try `stackql-deploy init {{ stack_name }} --provider=azure` or `stackql-deploy init {{ stack_name }} --provider=google`
 
-see the following links for more information on `stackql`, `stackql-deploy` and the `aws` provider:
+see the following links for more information on `stackql`, `stackql-deploy` and the `awscc` provider:
 
-- [`aws` provider docs](https://stackql.io/registry/aws)
+- [`awscc` provider docs](https://awscc.stackql.io/providers/awscc/)
 - [`stackql`](https://github.com/stackql/stackql)
-- [`stackql-deploy` PyPI home page](https://pypi.org/project/stackql-deploy/)
-- [`stackql-deploy` GitHub repo](https://github.com/stackql/stackql-deploy)
+- [`stackql-deploy` GitHub repo](https://github.com/stackql/stackql-deploy-rs)
 
 ## Overview
 
-__`stackql-deploy`__ is a stateless, declarative, SQL driven Infrastructure-as-Code (IaC) framework.  There is no state file required as the current state is assessed for each resource at runtime.  __`stackql-deploy`__ is capable of provisioning, deprovisioning and testing a stack which can include resources across different providers, like a stack spanning `aws` and `azure` for example.  
+__`stackql-deploy`__ is a stateless, declarative, SQL driven Infrastructure-as-Code (IaC) framework.  There is no state file required as the current state is assessed for each resource at runtime.  __`stackql-deploy`__ is capable of provisioning, deprovisioning and testing a stack which can include resources across different providers, like a stack spanning `aws` and `azure` for example.
 
 ## Prerequisites
 
-This example requires `stackql-deploy` to be installed using __`pip install stackql-deploy`__.  The host used to run `stackql-deploy` needs the necessary environment variables set to authenticate to your specific provider, in the case of the `aws` provider, `AWS_ACCESS_KEY_ID`, `AWS_SECRET_ACCESS_KEY` and optionally `AWS_SESSION_TOKEN` must be set, for more information on authentication to `aws` see the [`aws` provider documentation](https://aws.stackql.io/providers/aws).
+This example requires `stackql-deploy` to be installed.  The host used to run `stackql-deploy` needs the necessary environment variables set to authenticate to your specific provider, in the case of `aws`, `AWS_ACCESS_KEY_ID`, `AWS_SECRET_ACCESS_KEY` and optionally `AWS_SESSION_TOKEN` must be set, for more information on authentication to `aws` see the [`awscc` provider documentation](https://awscc.stackql.io/providers/awscc/).
 
 ## Usage
 
-Adjust the values in the [__`stackql_manifest.yml`__](stackql_manifest.yml) file if desired.  The [__`stackql_manifest.yml`__](stackql_manifest.yml) file contains resource configuration variables to support multiple deployment environments, these will be used for `stackql` queries in the `resources` folder.  
+Adjust the values in the [__`stackql_manifest.yml`__](stackql_manifest.yml) file if desired.  The [__`stackql_manifest.yml`__](stackql_manifest.yml) file contains resource configuration variables to support multiple deployment environments, these will be used for `stackql` queries in the `resources` folder.
 
 The syntax for the `stackql-deploy` command is as follows:
 
 ```bash
 stackql-deploy { build | test | teardown } { stack-directory } { deployment environment} [ optional flags ]
-``` 
+```
 
 ### Deploying a stack
 
 For example, to deploy the stack named {{ stack_name }} to an environment labeled `sit`, run the following:
 
 ```bash
 stackql-deploy build {{ stack_name }} sit \
--e AWS_REGION=ap-southeast-2
+-e AWS_REGION=us-east-1
 ```
 
 Use the `--dry-run` flag to view the queries to be run without actually running them, for example:
 
 ```bash
 stackql-deploy build {{ stack_name }} sit \
--e AWS_REGION=ap-southeast-2 \
+-e AWS_REGION=us-east-1 \
 --dry-run
 ```
 
@@ -50,7 +49,7 @@ To test a stack to ensure that all resources are present and in the desired stat
 
 ```bash
 stackql-deploy test {{ stack_name }} sit \
--e AWS_REGION=ap-southeast-2
+-e AWS_REGION=us-east-1
 ```
 
 ### Tearing down a stack
@@ -59,5 +58,5 @@ To destroy or deprovision all resources in a stack for our `sit` deployment exam
 
 ```bash
 stackql-deploy teardown {{ stack_name }} sit \
--e AWS_REGION=ap-southeast-2
-```
+-e AWS_REGION=us-east-1
+```

template-hub/aws/starter/resources/example_vpc.iql.template

@@ -1,67 +1,44 @@
-/* defines the provisioning and deprovisioning commands 
-used to create, update or delete the resource
-replace queries with your queries */
-
 /*+ exists */
+SELECT split_part(ResourceARN, '/', 2) as identifier
+FROM awscc.tagging.tagged_resources
+WHERE region = '{% raw %}{{ region }}{% endraw %}'
+AND TagFilters = '[{"Key":"stackql:stack-name","Values":["{% raw %}{{ stack_name }}{% endraw %}"]},{"Key":"stackql:stack-env","Values":["{% raw %}{{ stack_env }}{% endraw %}"]},{"Key":"stackql:resource-name","Values":["example_vpc"]}]'
+AND ResourceTypeFilters = '["ec2:vpc"]';
+
+/*+ statecheck, retries=5, retry_delay=5 */
 SELECT COUNT(*) as count FROM
 (
-SELECT vpc_id,
-json_group_object(tag_key, tag_value) as tags
-FROM aws.ec2.vpc_tags
-WHERE region = '{% raw %}{{ region }}{% endraw %}'
-AND cidr_block = '{% raw %}{{ vpc_cidr_block }}{% endraw %}'
-GROUP BY vpc_id
-HAVING json_extract(tags, '$.Provisioner') = 'stackql'
-AND json_extract(tags, '$.StackName') = '{% raw %}{{ stack_name }}{% endraw %}'
-AND json_extract(tags, '$.StackEnv') = '{% raw %}{{ stack_env }}{% endraw %}'
-) t; 
+SELECT vpc_id, cidr_block
+FROM awscc.ec2.vpcs
+WHERE Identifier = '{% raw %}{{ this.identifier }}{% endraw %}'
+AND region = '{% raw %}{{ region }}{% endraw %}'
+) t
+WHERE cidr_block = '{% raw %}{{ vpc_cidr_block }}{% endraw %}';
 
 /*+ create */
-INSERT INTO aws.ec2.vpcs (
+INSERT INTO awscc.ec2.vpcs (
  CidrBlock,
  Tags,
  EnableDnsSupport,
- EnableDnsHostnames, 
+ EnableDnsHostnames,
  region
 )
-SELECT 
+SELECT
  '{% raw %}{{ vpc_cidr_block }}{% endraw %}',
  '{% raw %}{{ vpc_tags }}{% endraw %}',
  true,
  true,
  '{% raw %}{{ region }}{% endraw %}';
 
-/*+ statecheck, retries=5, retry_delay=5 */
-SELECT COUNT(*) as count FROM
-(
-SELECT vpc_id,
-cidr_block,
-json_group_object(tag_key, tag_value) as tags
-FROM aws.ec2.vpc_tags
-WHERE region = '{% raw %}{{ region }}{% endraw %}'
-AND cidr_block = '{% raw %}{{ vpc_cidr_block }}{% endraw %}'
-GROUP BY vpc_id
-HAVING json_extract(tags, '$.Provisioner') = 'stackql'
-AND json_extract(tags, '$.StackName') = '{% raw %}{{ stack_name }}{% endraw %}'
-AND json_extract(tags, '$.StackEnv') = '{% raw %}{{ stack_env }}{% endraw %}'
-) t
-WHERE cidr_block = '{% raw %}{{ vpc_cidr_block }}{% endraw %}'; 
-
 /*+ exports, retries=5, retry_delay=5 */
-SELECT vpc_id, vpc_cidr_block FROM
-(
-SELECT vpc_id, cidr_block as "vpc_cidr_block",
-json_group_object(tag_key, tag_value) as tags
-FROM aws.ec2.vpc_tags
+SELECT split_part(ResourceARN, '/', 2) as vpc_id,
+'{% raw %}{{ vpc_cidr_block }}{% endraw %}' as vpc_cidr_block
+FROM awscc.tagging.tagged_resources
 WHERE region = '{% raw %}{{ region }}{% endraw %}'
-AND cidr_block = '{% raw %}{{ vpc_cidr_block }}{% endraw %}'
-GROUP BY vpc_id
-HAVING json_extract(tags, '$.Provisioner') = 'stackql'
-AND json_extract(tags, '$.StackName') = '{% raw %}{{ stack_name }}{% endraw %}'
-AND json_extract(tags, '$.StackEnv') = '{% raw %}{{ stack_env }}{% endraw %}'
-) t;
+AND TagFilters = '[{"Key":"stackql:stack-name","Values":["{% raw %}{{ stack_name }}{% endraw %}"]},{"Key":"stackql:stack-env","Values":["{% raw %}{{ stack_env }}{% endraw %}"]},{"Key":"stackql:resource-name","Values":["example_vpc"]}]'
+AND ResourceTypeFilters = '["ec2:vpc"]';
 
 /*+ delete */
-DELETE FROM aws.ec2.vpcs
-WHERE Identifier = '{% raw %}{{ vpc_id }}{% endraw %}'
-AND region = '{% raw %}{{ region }}{% endraw %}';
+DELETE FROM awscc.ec2.vpcs
+WHERE data__Identifier = '{% raw %}{{ vpc_id }}{% endraw %}'
+AND region = '{% raw %}{{ region }}{% endraw %}';

template-hub/aws/starter/stackql_manifest.yml.template

@@ -5,19 +5,19 @@ version: 1
 name: "{{ stack_name }}"
 description: description for "{{ stack_name }}"
 providers:
-  - aws
+  - awscc
 globals:
   - name: region
     description: aws region
     value: "{% raw %}{{ AWS_REGION }}{% endraw %}"
   - name: global_tags
     value:
-      - Key: Provisioner
-        Value: stackql
-      - Key: StackName
+      - Key: 'stackql:stack-name'
         Value: "{% raw %}{{ stack_name }}{% endraw %}"
-      - Key: StackEnv
+      - Key: 'stackql:stack-env'
         Value: "{% raw %}{{ stack_env }}{% endraw %}"
+      - Key: 'stackql:resource-name'
+        Value: "{% raw %}{{ resource_name }}{% endraw %}"
 resources:
   - name: example_vpc
     description: example vpc resource