tests: stop using stacker_blueprints in functional tests

cloudtools · Mar 20, 2019 · 02a797e · 02a797e
1 parent b43492e
commit 02a797e
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 17 deletions.
diff --git a/tests/fixtures/blueprints/bucket.yaml.j2 b/tests/fixtures/blueprints/bucket.yaml.j2
@@ -0,0 +1,10 @@
+AWSTemplateFormatVersion: 2010-09-09
+Resources:
+  Bucket:
+    Type: AWS::S3::Bucket
+    Properties:
+      BucketName: {{ variables.BucketName }}
+      AccessControl: Private
+Outputs:
+  BucketName:
+    Value: !Ref Bucket
diff --git a/tests/test_suite/34_stacker_build-integrated-hooks.bats b/tests/test_suite/34_stacker_build-integrated-hooks.bats
@@ -12,16 +12,14 @@ load ../test_helper
   needs_aws
 
   config() {
-    echo "namespace: ${STACKER_NAMESPACE}"
+    echo "namespace: ${STACKER_NAMESPACE}-integrated-hooks"
     cat <<'EOF'
 stacks:
-  - name: buckets
+  - name: bucket
     profile: stacker
-    class_path: stacker_blueprints.s3.Buckets
+    template_path: fixtures/blueprints/bucket.yaml.j2
     variables:
-      Buckets:
-        StackerTestBucket:
-          BucketName: "stacker-${envvar STACKER_NAMESPACE}-integrated-hooks-${awsparam AccountId}"
+      BucketName: "stacker-${envvar STACKER_NAMESPACE}-integrated-hooks-${awsparam AccountId}"
 
 build_hooks:
   - name: write-hello
@@ -38,7 +36,7 @@ build_hooks:
       command: 'aws s3 cp /tmp/hello.txt "s3://$BUCKET/hello.txt"'
       shell: true
       env:
-        BUCKET: "${output buckets::StackerTestBucketBucketId}"
+        BUCKET: "${output bucket::BucketName}"
         AWS_PROFILE: stacker
 
   - name: send-world
@@ -49,7 +47,7 @@ build_hooks:
       command: 'aws s3 cp "s3://$BUCKET/hello.txt" "s3://$BUCKET/world.txt"'
       shell: true
       env:
-        BUCKET: "${output buckets::StackerTestBucketBucketId}"
+        BUCKET: "${output bucket::BucketName}"
         AWS_PROFILE: stacker
 
 destroy_hooks:
@@ -59,7 +57,7 @@ destroy_hooks:
       command: 'aws s3 rm "s3://$BUCKET/world.txt"'
       shell: true
       env:
-        BUCKET: "${output buckets::StackerTestBucketBucketId}"
+        BUCKET: "${output bucket::BucketName}"
         AWS_PROFILE: stacker
 
   - name: remove-hello
@@ -70,13 +68,13 @@ destroy_hooks:
       command: 'aws s3 rm "s3://$BUCKET/hello.txt"'
       shell: true
       env:
-        BUCKET: "${output buckets::StackerTestBucketBucketId}"
+        BUCKET: "${output bucket::BucketName}"
         AWS_PROFILE: stacker
 
   - name: clean-hello
     path: stacker.hooks.command.run_command
     required_by:
-      - buckets
+      - bucket
     args:
       command: [rm, -f, /tmp/hello.txt]
 EOF
@@ -86,14 +84,14 @@ EOF
     stacker destroy --force <(config)
   }
 
-  stacker build <(config)
+  stacker build -t --recreate-failed <(config)
   assert "$status" -eq 0
   assert_has_line "Using default AWS provider mode"
   assert_has_lines_in_order -E <<'EOF'
 pre_build_hooks: complete
 write-hello: complete
-buckets: submitted \(creating new stack\)
-buckets: complete \(creating new stack\)
+bucket: submitted \(creating new stack\)
+bucket: complete \(creating new stack\)
 upload: [^ ]*/hello.txt to s3://[^ ]*/hello.txt
 send-hello: complete
 copy: s3://[^ ]*/hello.txt to s3://[^ ]*/world.txt
@@ -110,8 +108,8 @@ delete: s3://[^ ]*/world.txt
 remove-world: complete
 delete: s3://[^ ]*/hello.txt
 remove-hello: complete
-buckets: submitted \(submitted for destruction\)
-buckets: complete \(stack destroyed\)
+bucket: submitted \(submitted for destruction\)
+bucket: complete \(stack destroyed\)
 clean-hello: complete
 post_destroy_hooks: complete
 EOF
@@ -125,7 +123,7 @@ EOF
 pre_destroy_hooks: complete
 remove-world: skipped
 remove-hello: skipped
-buckets: skipped
+bucket: skipped
 clean-hello: complete
 post_destroy_hooks: complete
 EOF